diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-06-12 07:59:05 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-13 10:46:34 +0100 |
commit | 98a967d10d11dd3d086604c822385a71b21031f9 (patch) | |
tree | 2f81f250edf796c854d1ed7de8a967d58ed86410 /meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | |
parent | 93ddbfd17ddcfb94d3dda9d68dab1e58ea618860 (diff) | |
download | poky-98a967d10d11dd3d086604c822385a71b21031f9.tar.gz |
valgrind: Fix ptest build with musl
musl unearthed a problem when building out of tree, config.h was being
used from $(srcdir) instead of generated config.h in $(builddir)
this assumed functions e.g. mallinfo() and more which are not in musl
as a result tests broke.
Also add fixes to build remaining tests when building on musl
pass -fno-pie as it cant use PIE especially in ptests/x86_64
(From OE-Core rev: 8ab1828f073b5eab606161681a5f260cc0e77bf1)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/valgrind/valgrind_3.12.0.bb')
-rw-r--r-- | meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index d5a8dda487..d7b6d77000 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | |||
@@ -24,6 +24,13 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ | |||
24 | file://avoid-neon-for-targets-which-don-t-support-it.patch \ | 24 | file://avoid-neon-for-targets-which-don-t-support-it.patch \ |
25 | file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \ | 25 | file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \ |
26 | file://0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch \ | 26 | file://0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch \ |
27 | file://0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch \ | ||
28 | file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \ | ||
29 | file://0002-context-APIs-are-not-available-on-musl.patch \ | ||
30 | file://0003-correct-include-directive-path-for-config.h.patch \ | ||
31 | file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ | ||
32 | file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ | ||
33 | file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ | ||
27 | " | 34 | " |
28 | SRC_URI_append_libc-musl = "\ | 35 | SRC_URI_append_libc-musl = "\ |
29 | file://0001-fix-build-for-musl-targets.patch \ | 36 | file://0001-fix-build-for-musl-targets.patch \ |
@@ -67,6 +74,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" | |||
67 | SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}" | 74 | SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}" |
68 | 75 | ||
69 | CFLAGS_append_libc-uclibc = " -D__UCLIBC__ " | 76 | CFLAGS_append_libc-uclibc = " -D__UCLIBC__ " |
77 | CFLAGS += "-no-pie" | ||
70 | 78 | ||
71 | def get_mcpu(d): | 79 | def get_mcpu(d): |
72 | for arg in (d.getVar('TUNE_CCARGS') or '').split(): | 80 | for arg in (d.getVar('TUNE_CCARGS') or '').split(): |
@@ -76,6 +84,10 @@ def get_mcpu(d): | |||
76 | continue | 84 | continue |
77 | return "" | 85 | return "" |
78 | 86 | ||
87 | do_configure_prepend () { | ||
88 | rm -rf ${S}/config.h | ||
89 | } | ||
90 | |||
79 | do_install_append () { | 91 | do_install_append () { |
80 | install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/ | 92 | install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/ |
81 | } | 93 | } |