commit: c0dad8f0e252a0e30dbbe4e1f285f619374fed84 Author: Austin English <wizardedit <AT> gentoo <DOT> org> AuthorDate: Tue Dec 12 21:36:05 2017 +0000 Commit: Austin English <wizardedit <AT> gentoo <DOT> org> CommitDate: Tue Dec 12 21:59:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0dad8f0
dev-util/valgrind: fix test failures with newer glibc-3.13.0 Gentoo-Bug: https://bugs.gentoo.org/637488 Package-Manager: Portage-2.3.13, Repoman-2.3.3 .../files/valgrind-3.13.0-test-fixes.patch | 29 ++++++ dev-util/valgrind/valgrind-3.13.0-r1.ebuild | 112 +++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/dev-util/valgrind/files/valgrind-3.13.0-test-fixes.patch b/dev-util/valgrind/files/valgrind-3.13.0-test-fixes.patch new file mode 100644 index 00000000000..9bdd29013ba --- /dev/null +++ b/dev-util/valgrind/files/valgrind-3.13.0-test-fixes.patch @@ -0,0 +1,29 @@ +See: +https://bugs.gentoo.org/637488 +https://bugs.kde.org/show_bug.cgi?id=387686 + +commit 2b5eab6a8db1b0487a3ad7fc4e7eeda6d3513626 +Author: Mark Wielaard <[email protected]> +Date: Thu Jun 29 15:26:30 2017 +0000 + + memcheck/tests: Use ucontext_t instead of struct ucontext + + glibc 2.26 does not expose struct ucontext anymore. + + Signed-off-by: Khem Raj <[email protected]> + + git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16457 + +diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c +index a978fc2b0..7f97b90a5 100644 +--- a/memcheck/tests/linux/stack_changes.c ++++ b/memcheck/tests/linux/stack_changes.c +@@ -10,7 +10,7 @@ + // This test is checking the libc context calls (setcontext, etc.) and + // checks that Valgrind notices their stack changes properly. + +-typedef struct ucontext mycontext; ++typedef ucontext_t mycontext; + + mycontext ctx1, ctx2, oldc; + int count; diff --git a/dev-util/valgrind/valgrind-3.13.0-r1.ebuild b/dev-util/valgrind/valgrind-3.13.0-r1.ebuild new file mode 100644 index 00000000000..1abaadfd609 --- /dev/null +++ b/dev-util/valgrind/valgrind-3.13.0-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +inherit autotools flag-o-matic toolchain-funcs multilib pax-utils + +DESCRIPTION="An open-source memory debugger for GNU/Linux" +HOMEPAGE="http://www.valgrind.org"; +LICENSE="GPL-2" +SLOT="0" +IUSE="mpi" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/" + inherit git-r3 +else + SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"; + KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +fi + +DEPEND="mpi? ( virtual/mpi )" +RDEPEND="${DEPEND}" + +src_prepare() { + # Correct hard coded doc location + sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die + + # 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 + + # Fix test failures on glibc-2.26 + eapply "${FILESDIR}"/${P}-test-fixes.patch + + # Allow users to test their own patches + eapply_user + + # Regenerate autotools files + eautoreconf +} + +src_configure() { + local myconf + + # Respect ar, bug #468114 + tc-export AR + + # -fomit-frame-pointer "Assembler messages: Error: junk `8' after expression" + # while compiling insn_sse.c in none/tests/x86 + # -fstack-protector more undefined references to __guard and __stack_smash_handler + # because valgrind doesn't link to glibc (bug #114347) + # -fstack-protector-all Fails same way as -fstack-protector/-fstack-protector-strong. + # Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it + # -fstack-protector-strong See -fstack-protector (bug #620402) + # -m64 -mx32 for multilib-portage, bug #398825 + # -ggdb3 segmentation fault on startup + filter-flags -fomit-frame-pointer + filter-flags -fstack-protector + filter-flags -fstack-protector-all + filter-flags -fstack-protector-strong + filter-flags -m64 -mx32 + replace-flags -ggdb3 -ggdb2 + + if use amd64 || use ppc64; then + ! has_multilib_profile && myconf="${myconf} --enable-only64bit" + fi + + # Force bitness on darwin, bug #306467 + use x86-macos && myconf="${myconf} --enable-only32bit" + use x64-macos && myconf="${myconf} --enable-only64bit" + + # Don't use mpicc unless the user asked for it (bug #258832) + if ! use mpi; then + myconf="${myconf} --without-mpicc" + fi + + econf ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install + + if [[ ${PV} == "9999" ]]; then + # Otherwise FAQ.txt won't exist: + emake -C docs FAQ.txt + mv docs/FAQ.txt . || die "Couldn't move FAQ.txt" + fi + + dodoc AUTHORS FAQ.txt NEWS README* + + pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_names on shared libraries, can't turn them into bundles, + # as dyld won't load them any more then, bug #306467 + local l + for l in "${ED}"/usr/lib/valgrind/*.so ; do + install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}" + done + fi +} + +pkg_postinst() { + elog "Valgrind will not work if glibc does not have debug symbols." + elog "To fix this you can add splitdebug to FEATURES in make.conf" + elog "and remerge glibc. See:" + elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"; + elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"; + elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"; +}
