diff options
| author |   Sam James <sam@gentoo.org> | 2022-09-10 02:57:00 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-09-10 02:57:18 +0100 |
| commit | 80b1fc1e8b31f1e0b775cc2b856a64e7e058587f (patch) | |
| tree | 93d290db3619c11967c49b1586072c2d44c00519 /dev-util/valgrind/valgrind-9999.ebuild | |
| parent | app-misc/screen: fix build w/ Clang 15 (fix configure tests) (diff) | |
| download | gentoo-80b1fc1e8b31f1e0b775cc2b856a64e7e058587f.tar.gz gentoo-80b1fc1e8b31f1e0b775cc2b856a64e7e058587f.tar.bz2 gentoo-80b1fc1e8b31f1e0b775cc2b856a64e7e058587f.zip | |
dev-util/valgrind: fix build w/ Clang 15
Closes: https://bugs.gentoo.org/869320
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util/valgrind/valgrind-9999.ebuild')
| -rw-r--r-- | dev-util/valgrind/valgrind-9999.ebuild | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild index 7e7417e90831..aed73f6be21b 100644 --- a/dev-util/valgrind/valgrind-9999.ebuild +++ b/dev-util/valgrind/valgrind-9999.ebuild @@ -22,6 +22,12 @@ IUSE="mpi" DEPEND="mpi? ( virtual/mpi )" RDEPEND="${DEPEND}" +PATCHES=( + # Respect CFLAGS, LDFLAGS + "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch + "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch +) + src_prepare() { # Correct hard coded doc location sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die @@ -29,15 +35,10 @@ src_prepare() { # Don't force multiarch stuff on OSX, bug #306467 sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die - # Respect CFLAGS, LDFLAGS - eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch - - eapply "${FILESDIR}"/${PN}-3.15.0-Build-ldst_multiple-test-with-fno-pie.patch - - # conditionally copy musl specific suppressions && apply patch + # Conditionally copy musl specific suppressions && apply patch if use elibc_musl ; then cp "${FILESDIR}/musl.supp" "${S}" || die - eapply "${FILESDIR}/valgrind-3.13.0-malloc.patch" + PATCHES+=( "${FILESDIR}"/valgrind-3.13.0-malloc.patch ) fi if [[ ${CHOST} == *-solaris* ]] ; then @@ -49,8 +50,7 @@ src_prepare() { cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in fi - # Allow users to test their own patches - eapply_user + default # Regenerate autotools files eautoreconf |