From 6b933047f46efec1aa747570f945344254227457 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Dec 2017 17:25:28 +0000 Subject: gentoo resync : 15.12.2017 --- dev-util/valgrind/Manifest | 6 +- .../files/valgrind-3.13.0-test-fixes.patch | 29 ++++++ dev-util/valgrind/valgrind-3.13.0-r1.ebuild | 112 +++++++++++++++++++++ dev-util/valgrind/valgrind-3.13.0.ebuild | 2 +- dev-util/valgrind/valgrind-9999.ebuild | 8 +- 5 files changed, 151 insertions(+), 6 deletions(-) create mode 100644 dev-util/valgrind/files/valgrind-3.13.0-test-fixes.patch create mode 100644 dev-util/valgrind/valgrind-3.13.0-r1.ebuild (limited to 'dev-util/valgrind') diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest index 85e1cf1a4e13..c450bb53be0b 100644 --- a/dev-util/valgrind/Manifest +++ b/dev-util/valgrind/Manifest @@ -1,8 +1,10 @@ +AUX valgrind-3.13.0-test-fixes.patch 929 BLAKE2B cf0316cc3637785bfa57cd2277ad7669ab968b28424bdcf56c47219c90d00915f51293bfc90f5319785752bcebbde7b011dbac964f9538ac2f4208ec7709047f SHA512 1cff77e987e2d20ce1563c96d76431c60c142c42afa978e32d3a8c8dda17d0f3c1ba29fe3d0fcf0e7445fa5ca9558690ecdaad259fb9d23f435dcdc0baa9175d AUX valgrind-3.7.0-fno-stack-protector.patch 554 BLAKE2B cd87e1bbf86b82face9dbbaddbbbb2773c6f1223e725898dfd5d0ae9078948642c4f2b9deca2bded676230bcfa20d39071f69e640a64dc254759115971374a82 SHA512 4f9573fd68a0e1e209518fb4100c27b697ccd28e7a39abaa921f1949cd87ffb79a6784d2d1f6e006d68a08c7217cee77cba378c18aab48b87a3824eedb53ed5e AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3 DIST valgrind-3.12.0.tar.bz2 12788556 BLAKE2B aeebf9c29afb3cce683c6448a3dec8f4edb1e44b2043a8e159c57a28c75fee49c5dba144d7ae2d79d23fe5a6c5b2bbf01fc398909bf12eebc027f8a7d4d83009 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be DIST valgrind-3.13.0.tar.bz2 14723076 BLAKE2B cdf92087575cc851d316e2136081441f528596048bc5d1e9c17539283085dd9accd0c1b3136f9768a62de27d1f1641b450305681a33d9ba9fdfe028a73c0cb99 SHA512 34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009 EBUILD valgrind-3.12.0.ebuild 2854 BLAKE2B 07c651acb3854432137f09513f991cb549b6192a704a26ed9626816f8650acfca0179c7064e772e59058a7657b1c0407a87753ec30b2209cf47aa04d68d908ca SHA512 a65f3ccca3a33e2bbae7d2616b2fa13a6a3913e927f601f8ef52172981f72c03219ccad126a801719688cb6106dea18c56ac0e14de194e065bffa744151ab457 -EBUILD valgrind-3.13.0.ebuild 2856 BLAKE2B ad4ff8380282cd346d6eac738ce20923f691ac76d7320323f953e0952819abddbc036d4e9e45ae27d25d28fc57e5d44881c9c4c19c62c110a32a9854e28f3701 SHA512 725a27538443da5ff6ffe23ba58ea42d6b0d9d13cbd5690f61bb4470f25e95ac4551b50bf6deaf0624b3dff6db7354ad170e7fd1a4cf2e0650924bb6073941e9 -EBUILD valgrind-9999.ebuild 3117 BLAKE2B a35ad34b47cf155735d088dd0e1655ae125eebc1f1b20bdefba3225700008d10d8f4e9bede7ea5c08a3352de76296c9027157d86e283311a37eb6b1f9d42edc9 SHA512 8fcb9250a1a602463dfe112d0340bcc6a565beb33979172c2f2cbbdd499e744aa05b9a17c0164ea6f57e3720cc582b831a061e0a75984b0007b10f18dbdf873d +EBUILD valgrind-3.13.0-r1.ebuild 3428 BLAKE2B 96f18609fe79c997b4d344ecf59be9356aafd5ed7bc4e03b028f06e3e938ee1f00440289f7918ab935ccc42fa2bea2d316bb1d96c43ef40a85374b12e0b5683c SHA512 aa0fe6e76e52d25c6b05a30c46de96aabf539f7166bd369b21b93522d52e01d9fc50c77769170021038b0ec60911cd07bf5afccca86e35ad49828e401ed4d61e +EBUILD valgrind-3.13.0.ebuild 2855 BLAKE2B d0a2dab76a64046f4fab77db0c0ed98a247a84af822557d474cb2169fc9c35f0f6a4045924e5acd86b31bf1c85d8c6ca7a373a0e2014312e549f00d31bd0e7e7 SHA512 736df64c4de217aaf198a7f3a7d3d61a7304e40ca952fdc4d7a2563e2c61b9fbe3173f1e91681f754a191e67cd20225f8a64ba5bbe3ed84616811b0073549da9 +EBUILD valgrind-9999.ebuild 3348 BLAKE2B 5d2b5d3b25411a261d2a9ce7563eddccca88c31e9dd99df5344eea2ccbf296151d3b858af5655a891f45f65635cd5d1f6398efa501729be15418b14a00b88488 SHA512 baf5e2ce5f9b529f472b91d3a38378f7e612031b832e4960cd2fee2941755796d15a5cc3a14f7ec3679bb3d34f3a4ffdf6a9d77ccf713241f033bb8d0cccd844 MISC metadata.xml 1139 BLAKE2B fef548fc43861a5c031c4db6fcd5a446cb3a33b030916a118de1d99e78fc893991cd20f06d545d7731668e4ad859ded8e8b980e35e383ba27ecb96b704757a95 SHA512 f3ee37b8e5f408c01d5f6308644305fcb945df008e5f708dbde95f73a1e7988f53799e28bd72f75bd5e01765414a0e11b8045f671e723beb46d90a50f5dd1846 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 000000000000..9bdd29013ba7 --- /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 +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 + + 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 000000000000..1abaadfd6092 --- /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" +} diff --git a/dev-util/valgrind/valgrind-3.13.0.ebuild b/dev-util/valgrind/valgrind-3.13.0.ebuild index f4d80dc38c7e..6e84e64882f1 100644 --- a/dev-util/valgrind/valgrind-3.13.0.ebuild +++ b/dev-util/valgrind/valgrind-3.13.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="-* amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="mpi" DEPEND="mpi? ( virtual/mpi )" diff --git a/dev-util/valgrind/valgrind-9999.ebuild b/dev-util/valgrind/valgrind-9999.ebuild index 6414792ca62c..855bd8a16c29 100644 --- a/dev-util/valgrind/valgrind-9999.ebuild +++ b/dev-util/valgrind/valgrind-9999.ebuild @@ -31,9 +31,6 @@ src_prepare() { # Respect CFLAGS, LDFLAGS eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch - # Changing Makefile.all.am to disable SSP - eapply "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch - # Allow users to test their own patches eapply_user @@ -51,10 +48,15 @@ src_configure() { # 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 -- cgit v1.2.3