diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-26 12:50:09 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-26 13:45:45 +0000 |
| commit | 6a74caa115298e594ae22a9de91b132db62e4b5d (patch) | |
| tree | db83126955a37af1dac1360da527defe3defc45a /meta | |
| parent | e8f265e957e187b4f84f566aaeec8f514e3044d6 (diff) | |
| download | openembedded-core-contrib-6a74caa115298e594ae22a9de91b132db62e4b5d.tar.gz | |
valgrind: Fix build on musl after drd fixes
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.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.16.1.bb | 1 |
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 @@ +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 + + /** 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 \ file://0001-none-tests-fdleak_cmsg.stderr.exp-adjust-tmp-paths.patch \ file://0001-memcheck-tests-Fix-timerfd-syscall-test.patch \ file://0001-drd-Port-to-Fedora-33.patch \ + file://0001-drd-musl-fix.patch \ " SRC_URI[md5sum] = "d1b153f1ab17cf1f311705e7a83ef589" SRC_URI[sha256sum] = "c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca" |