From c5aa5e0a20b2e197a0d0ba3d3daefcb1c59b932c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 22 Nov 2024 10:17:44 -0800 Subject: [PATCH] taisei: Fix build with musl This patch fixed issue on glibc but regressed on musl Signed-off-by: Khem Raj --- ...armful-Use-overloadable-func-attribu.patch | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch index d1af07416d..09f4be300c 100644 --- a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch +++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch @@ -20,21 +20,39 @@ Signed-off-by: Khem Raj src/util/consideredharmful.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/src/util/consideredharmful.h b/src/util/consideredharmful.h -index 3fe1f047..c6771956 100644 --- a/src/util/consideredharmful.h +++ b/src/util/consideredharmful.h -@@ -30,11 +30,11 @@ FILE* fopen(); +@@ -8,6 +8,7 @@ + + #pragma once + #include "taisei.h" ++#include "util/compat.h" + + #include + +@@ -24,17 +25,23 @@ PRAGMA(GCC diagnostic ignored "-Wstrict- + // clang generates lots of these warnings with _FORTIFY_SOURCE + PRAGMA(GCC diagnostic ignored "-Wignored-attributes") + ++#ifdef __GLIBC__ ++#define OVERLOADABLE __attribute__((overloadable)) ++#else ++#define OVERLOADABLE ++#endif ++ + #undef fopen + attr_deprecated("Use vfs_open or SDL_RWFromFile instead") + FILE* fopen(); #undef strncat attr_deprecated("This function likely doesn't do what you expect, use strlcat") -char* strncat(); -+char* __attribute__((overloadable)) strncat(); ++char* OVERLOADABLE strncat(); #undef strncpy attr_deprecated("This function likely doesn't do what you expect, use strlcpy") -char* strncpy(); -+char* __attribute__((overloadable)) strncpy(); ++char* OVERLOADABLE strncpy(); #undef errx attr_deprecated("Use log_fatal instead")