summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-26 12:50:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-26 22:08:36 +0000
commitad818f8b23ad9317a7e7d5daa6958ff9054e93f6 (patch)
tree3cc3633e9d5ff27f352dca29103d4fe5ba4d23dd /meta
parent6dddb2345b91a4701ccaa85eecb3ce8261d3780b (diff)
downloadpoky-ad818f8b23ad9317a7e7d5daa6958ff9054e93f6.tar.gz
valgrind: Fix build on musl after drd fixes
(From OE-Core rev: 6a74caa115298e594ae22a9de91b132db62e4b5d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/0001-drd-musl-fix.patch31
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.16.1.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-drd-musl-fix.patch b/meta/recipes-devtools/valgrind/valgrind/0001-drd-musl-fix.patch
new file mode 100644
index 0000000000..e96bf3c611
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/0001-drd-musl-fix.patch
@@ -0,0 +1,31 @@
1The changes in 0001-drd-Port-to-Fedora-33.patch break builds on musl. These
2need a __GLIBC__ guard to ensure musl builds continue to work.
3
4Upstream-Status: Pending
5Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
6
7Index: valgrind-3.16.1/drd/drd_pthread_intercepts.c
8===================================================================
9--- valgrind-3.16.1.orig/drd/drd_pthread_intercepts.c
10+++ valgrind-3.16.1/drd/drd_pthread_intercepts.c
11@@ -180,6 +180,7 @@ static int never_true;
12 * functions in both libc and libpthread. Older glibc versions only have an
13 * implementation of the pthread functions in libpthread.
14 */
15+#ifdef __GLIBC__
16 #define PTH_FUNC(ret_ty, zf, implf, argl_decl, argl) \
17 ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBC_SONAME,zf) argl_decl; \
18 ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBC_SONAME,zf) argl_decl \
19@@ -187,6 +188,12 @@ static int never_true;
20 ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl; \
21 ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl \
22 { return implf argl; }
23+#else
24+#define PTH_FUNC(ret_ty, zf, implf, argl_decl, argl) \
25+ ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl; \
26+ ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl \
27+ { return implf argl; }
28+#endif
29 #endif
30
31 /**
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb b/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb
index 7508098b55..bcba55f327 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.16.1.bb
@@ -41,6 +41,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
41 file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ 41 file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \
42 file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ 42 file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \
43 file://0001-drd-Port-to-Fedora-33.patch \ 43 file://0001-drd-Port-to-Fedora-33.patch \
44 file://0001-drd-musl-fix.patch \
44 " 45 "
45SRC_URI[md5sum] = "d1b153f1ab17cf1f311705e7a83ef589" 46SRC_URI[md5sum] = "d1b153f1ab17cf1f311705e7a83ef589"
46SRC_URI[sha256sum] = "c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca" 47SRC_URI[sha256sum] = "c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca"