summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-07-11 22:50:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:38 +0100
commitcc0d3d0936d2534e44eb4375c38d70af6148932e (patch)
tree1b0bca68c1f56cddf6fc83c148466c0cff4d3dc2 /meta
parent87f2328fb271ee34d5102cfdb6d66f97fd5188bd (diff)
downloadpoky-cc0d3d0936d2534e44eb4375c38d70af6148932e.tar.gz
valgrind: fix link failure with gold
(From OE-Core rev: 4c38908169a11635138d357fa4be39a80d6285e8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch27
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.12.0.bb1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch b/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch
new file mode 100644
index 0000000000..db322398c2
--- /dev/null
+++ b/meta/recipes-devtools/valgrind/valgrind/link-gz-tests.patch
@@ -0,0 +1,27 @@
1When checking if the compiler supports compressed debug sections we need to
2actually link instead of just compile. Otherwise the compiler thinks that
3they are supported, but gold does not support -gz=zlib.
4
5Upstream-Status: Backport (r16459)
6Signed-off-by: Ross Burton <ross.burton@intel.com>
7
8--- a/configure.ac~ 2017-07-11 11:53:16.000000000 +0100
9+++ b/configure.ac 2017-07-11 18:16:13.674130483 +0100
10@@ -2119,7 +2119,7 @@
11 safe_CFLAGS=$CFLAGS
12 CFLAGS="-g -gz=zlib"
13
14-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[
15+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[
16 return 0;
17 ]])], [
18 ac_have_gz_zlib=yes
19@@ -2139,7 +2139,7 @@
20 safe_CFLAGS=$CFLAGS
21 CFLAGS="-g -gz=zlib-gnu"
22
23-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[
24+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]], [[
25 return 0;
26 ]])], [
27 ac_have_gz_zlib_gnu=yes
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
index b63d27861d..0cc5eefc88 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
@@ -35,6 +35,7 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
35 file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \ 35 file://0001-memcheck-arm64-Define-__THROW-if-not-already-defined.patch \
36 file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ 36 file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \
37 file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ 37 file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \
38 file://link-gz-tests.patch \
38 " 39 "
39SRC_URI_append_libc-musl = "\ 40SRC_URI_append_libc-musl = "\
40 file://0001-fix-build-for-musl-targets.patch \ 41 file://0001-fix-build-for-musl-targets.patch \