diff options
2 files changed, 41 insertions, 0 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 new file mode 100644 index 0000000000..d1af07416d --- /dev/null +++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei/0001-util-consideredharmful-Use-overloadable-func-attribu.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 6f40a8cfbc4dd5ca4c3156338e8e35f25d4d4599 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 22 Nov 2024 01:16:25 -0800 | ||
4 | Subject: [PATCH] util/consideredharmful: Use overloadable func attribute with | ||
5 | clang | ||
6 | |||
7 | When building with glibc HEAD, it has fortified headers with clang as well | ||
8 | and clang reports errors e.g. | ||
9 | |||
10 | | ../git/src/util/consideredharmful.h:33:7: error: redeclaration of 'strncat' must have the 'overloadable' attribute | ||
11 | | 33 | char* strncat(); | ||
12 | | | ^ | ||
13 | | /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/taisei/1.4.2/recipe-sysroot/usr/include/bits/string_fortified.h:145:8: note: previous overload of function is here | ||
14 | | 145 | __NTH (strncat (__fortify_clang_overload_arg (char *, __restrict, __dest), | ||
15 | | | ^ | ||
16 | |||
17 | Upstream-Status: Submitted [https://github.com/taisei-project/taisei/pull/393] | ||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | --- | ||
20 | src/util/consideredharmful.h | 4 ++-- | ||
21 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/src/util/consideredharmful.h b/src/util/consideredharmful.h | ||
24 | index 3fe1f047..c6771956 100644 | ||
25 | --- a/src/util/consideredharmful.h | ||
26 | +++ b/src/util/consideredharmful.h | ||
27 | @@ -30,11 +30,11 @@ FILE* fopen(); | ||
28 | |||
29 | #undef strncat | ||
30 | attr_deprecated("This function likely doesn't do what you expect, use strlcat") | ||
31 | -char* strncat(); | ||
32 | +char* __attribute__((overloadable)) strncat(); | ||
33 | |||
34 | #undef strncpy | ||
35 | attr_deprecated("This function likely doesn't do what you expect, use strlcpy") | ||
36 | -char* strncpy(); | ||
37 | +char* __attribute__((overloadable)) strncpy(); | ||
38 | |||
39 | #undef errx | ||
40 | attr_deprecated("Use log_fatal instead") | ||
diff --git a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.2.bb b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.2.bb index 4d34239a98..db38bb1547 100644 --- a/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.2.bb +++ b/meta-oe/dynamic-layers/multimedia-layer/recipes-graphics/taisei/taisei_1.4.2.bb | |||
@@ -31,6 +31,7 @@ RDEPENDS_${PN} = "\ | |||
31 | " | 31 | " |
32 | 32 | ||
33 | SRC_URI = "gitsm://github.com/taisei-project/taisei.git;branch=v1.4.x;protocol=https \ | 33 | SRC_URI = "gitsm://github.com/taisei-project/taisei.git;branch=v1.4.x;protocol=https \ |
34 | file://0001-util-consideredharmful-Use-overloadable-func-attribu.patch \ | ||
34 | file://0001-Remove-strip-option-from-executable-build.patch" | 35 | file://0001-Remove-strip-option-from-executable-build.patch" |
35 | 36 | ||
36 | SRCREV = "c098579d4fa0f004ccc204c5bc46eac3717cba28" | 37 | SRCREV = "c098579d4fa0f004ccc204c5bc46eac3717cba28" |