Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/valgrind/, dev-util/valgrind/files/
Date: Mon, 04 Nov 2019 17:39:27
Message-Id: 1572889150.d720304b0505f3791eb088673aaba891b73b16d6.mattst88@gentoo
1 commit: d720304b0505f3791eb088673aaba891b73b16d6
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 4 17:37:34 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 4 17:39:10 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d720304b
7
8 dev-util/valgrind: Fix test suite build failure on ppc
9
10 Closes: https://bugs.gentoo.org/685070
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 ...5.0-Build-ldst_multiple-test-with-fno-pie.patch | 22 ++++++++++++++++++++++
14 dev-util/valgrind/valgrind-3.15.0.ebuild | 2 ++
15 dev-util/valgrind/valgrind-9999.ebuild | 2 ++
16 3 files changed, 26 insertions(+)
17
18 diff --git a/dev-util/valgrind/files/valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch b/dev-util/valgrind/files/valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
19 new file mode 100644
20 index 00000000000..44176658df7
21 --- /dev/null
22 +++ b/dev-util/valgrind/files/valgrind-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
23 @@ -0,0 +1,22 @@
24 +From beab8d9f8d65230567270331017184c8762faa42 Mon Sep 17 00:00:00 2001
25 +From: Matt Turner <mattst88@×××××.com>
26 +Date: Mon, 4 Nov 2019 09:12:16 -0800
27 +Subject: [PATCH] Build ldst_multiple test with -fno-pie
28 +
29 +Bug: https://bugs.gentoo.org/685070
30 +---
31 + none/tests/ppc32/Makefile.am | 1 +
32 + 1 file changed, 1 insertion(+)
33 +
34 +diff --git a/none/tests/ppc32/Makefile.am b/none/tests/ppc32/Makefile.am
35 +index 11697c99a..222efd3f2 100644
36 +--- a/none/tests/ppc32/Makefile.am
37 ++++ b/none/tests/ppc32/Makefile.am
38 +@@ -156,3 +156,4 @@ test_isa_2_07_part2_LDADD = -lm
39 + test_tm_LDADD = -lm
40 + test_touch_tm_LDADD = -lm
41 +
42 ++ldst_multiple_CFLAGS = $(AM_CFLAGS) -fno-pie
43 +--
44 +2.23.0
45 +
46
47 diff --git a/dev-util/valgrind/valgrind-3.15.0.ebuild b/dev-util/valgrind/valgrind-3.15.0.ebuild
48 index b18a128859a..d252d9dcee4 100644
49 --- a/dev-util/valgrind/valgrind-3.15.0.ebuild
50 +++ b/dev-util/valgrind/valgrind-3.15.0.ebuild
51 @@ -31,6 +31,8 @@ src_prepare() {
52 # Respect CFLAGS, LDFLAGS
53 eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
54
55 + eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
56 +
57 if [[ ${CHOST} == *-solaris* ]] ; then
58 # upstream doesn't support this, but we don't build with
59 # Sun/Oracle ld, we have a GNU toolchain, so get some things
60
61 diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild
62 index b7152e95dc5..41689a1904e 100644
63 --- a/dev-util/valgrind/valgrind-9999.ebuild
64 +++ b/dev-util/valgrind/valgrind-9999.ebuild
65 @@ -31,6 +31,8 @@ src_prepare() {
66 # Respect CFLAGS, LDFLAGS
67 eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
68
69 + eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch
70 +
71 if [[ ${CHOST} == *-solaris* ]] ; then
72 # upstream doesn't support this, but we don't build with
73 # Sun/Oracle ld, we have a GNU toolchain, so get some things