mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

valgrind: Fix build on musl after drd fixes

Browse Source 
(From OE-Core rev: 6a74caa115298e594ae22a9de91b132db62e4b5d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2020-10-26 12:50:09 +00:00
parent 6dddb2345b
commit ad818f8b23
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
meta/recipes-devtools/valgrind/valgrind/0001-drd-musl-fix.patch Normal file
View File

@@ -0,0 +1,31 @@
The changes in 0001-drd-Port-to-Fedora-33.patch break builds on musl. These
need a __GLIBC__ guard to ensure musl builds continue to work.
Upstream-Status: Pending
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Index: valgrind-3.16.1/drd/drd_pthread_intercepts.c
===================================================================
--- valgrind-3.16.1.orig/drd/drd_pthread_intercepts.c
+++ valgrind-3.16.1/drd/drd_pthread_intercepts.c
@@ -180,6 +180,7 @@ static int never_true;
* functions in both libc and libpthread. Older glibc versions only have an
* implementation of the pthread functions in libpthread.
*/
+#ifdef __GLIBC__
#define PTH_FUNC(ret_ty, zf, implf, argl_decl, argl) \
ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBC_SONAME,zf) argl_decl; \
ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBC_SONAME,zf) argl_decl \
@@ -187,6 +188,12 @@ static int never_true;
ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl; \
ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl \
{ return implf argl; }
+#else
+#define PTH_FUNC(ret_ty, zf, implf, argl_decl, argl) \
+ ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl; \
+ ret_ty VG_WRAP_FUNCTION_ZZ(VG_Z_LIBPTHREAD_SONAME,zf) argl_decl \
+ { return implf argl; }
+#endif
#endif
/**

1
meta/recipes-devtools/valgrind/valgrind_3.16.1.bb
View File

@@ -41,6 +41,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \
file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \
file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \
file://0001-drd-Port-to-Fedora-33.patch \ file://0001-drd-Port-to-Fedora-33.patch \
file://0001-drd-musl-fix.patch \
" "
SRC_URI[md5sum] = "d1b153f1ab17cf1f311705e7a83ef589" SRC_URI[md5sum] = "d1b153f1ab17cf1f311705e7a83ef589"
SRC_URI[sha256sum] = "c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca" SRC_URI[sha256sum] = "c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca"