commit:     65361448b036a5a9f2ed5790a556316d58a3b782
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 20:11:18 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 20:30:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65361448

dev-util/valgrind: version bump to 3.12.0

Package-Manager: portage-2.2.28

 dev-util/valgrind/Manifest                         |   1 +
 .../files/valgrind-3.12.0-non-exec-stack.patch     |  86 ++++++++++++++++++
 dev-util/valgrind/valgrind-3.12.0.ebuild           | 100 +++++++++++++++++++++
 3 files changed, 187 insertions(+)

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index d251a79..4af5f23 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,2 +1,3 @@
 DIST valgrind-3.10.1.tar.bz2 10967905 SHA256 
fa253dc26ddb661b6269df58144eff607ea3f76a9bcfe574b0c7726e1dfcb997 SHA512 
8f3d27637c13b06381b3dd44088244e0cf2f7008f40e46f34322f2a5bfa6373d29ce68ff49f19c48f1a5f139d8be5838b9606206e0ce2599c5f74c0db8ce2642
 WHIRLPOOL 
3d55f35b02195d9859d9192726ea708277f1d3339005d959baa224822c5b71f5347cdd28c7fd8153c10d1e3282855e853caf9c7192751bebdbbc3444c33d885a
 DIST valgrind-3.11.0.tar.bz2 11910809 SHA256 
6c396271a8c1ddd5a6fb9abe714ea1e8a86fce85b30ab26b4266aeb4c2413b42 SHA512 
a25f97fa80aef4ad1e86b303886cd7a97aac248820a4c24e3d3dc26567dd7d2d86db237866468fd43885a9fb8534cb0a8e301a3c752fffbc231a2842272999da
 WHIRLPOOL 
a881df25e64789954d9bcb44617fd92d832ae9953689c01f8f79d737379c523a6f3a8125283518a6f256770a5c4f204b7b859794cf714abb0a742a69b272ef0e
+DIST valgrind-3.12.0.tar.bz2 12788556 SHA256 
67ca4395b2527247780f36148b084f5743a68ab0c850cb43e4a5b4b012cf76a1 SHA512 
2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be
 WHIRLPOOL 
136dd4f358bd18165a5801083cc73fc269a84bf491880af9842e789feea62181e16ca4c099db06fb4ffacf0cb0189b1b29d64790cc4202442f6f6b71ce4c6eea

diff --git a/dev-util/valgrind/files/valgrind-3.12.0-non-exec-stack.patch 
b/dev-util/valgrind/files/valgrind-3.12.0-non-exec-stack.patch
new file mode 100644
index 00000000..7f41eff
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.12.0-non-exec-stack.patch
@@ -0,0 +1,86 @@
+diff -Naur valgrind-3.12.0.orig/coregrind/Makefile.am 
valgrind-3.12.0/coregrind/Makefile.am
+--- valgrind-3.12.0.orig/coregrind/Makefile.am 2016-10-21 06:37:39.000000000 
-0400
++++ valgrind-3.12.0/coregrind/Makefile.am      2016-10-23 16:05:46.904546117 
-0400
+@@ -359,21 +359,6 @@
+       m_demangle/dyn-string.c \
+       m_demangle/d-demangle.c \
+       m_demangle/safe-ctype.c \
+-      m_dispatch/dispatch-x86-linux.S \
+-      m_dispatch/dispatch-amd64-linux.S \
+-      m_dispatch/dispatch-ppc32-linux.S \
+-      m_dispatch/dispatch-ppc64be-linux.S \
+-      m_dispatch/dispatch-ppc64le-linux.S \
+-      m_dispatch/dispatch-arm-linux.S \
+-      m_dispatch/dispatch-arm64-linux.S \
+-      m_dispatch/dispatch-s390x-linux.S \
+-      m_dispatch/dispatch-mips32-linux.S \
+-      m_dispatch/dispatch-mips64-linux.S \
+-      m_dispatch/dispatch-tilegx-linux.S \
+-      m_dispatch/dispatch-x86-darwin.S \
+-      m_dispatch/dispatch-amd64-darwin.S \
+-      m_dispatch/dispatch-x86-solaris.S \
+-      m_dispatch/dispatch-amd64-solaris.S \
+       m_gdbserver/inferiors.c \
+       m_gdbserver/m_gdbserver.c \
+       m_gdbserver/regcache.c \
+@@ -399,8 +384,6 @@
+       m_initimg/initimg-pathscan.c \
+       m_mach/mach_basics.c \
+       m_mach/mach_msg.c \
+-      m_mach/mach_traps-x86-darwin.S \
+-      m_mach/mach_traps-amd64-darwin.S \
+       m_replacemalloc/replacemalloc_core.c \
+       m_scheduler/sched-lock.c \
+       m_scheduler/sched-lock-generic.c \
+@@ -420,21 +403,6 @@
+       m_sigframe/sigframe-x86-darwin.c \
+       m_sigframe/sigframe-amd64-darwin.c \
+       m_sigframe/sigframe-solaris.c \
+-      m_syswrap/syscall-x86-linux.S \
+-      m_syswrap/syscall-amd64-linux.S \
+-      m_syswrap/syscall-ppc32-linux.S \
+-      m_syswrap/syscall-ppc64be-linux.S \
+-      m_syswrap/syscall-ppc64le-linux.S \
+-      m_syswrap/syscall-arm-linux.S \
+-      m_syswrap/syscall-arm64-linux.S \
+-      m_syswrap/syscall-s390x-linux.S \
+-      m_syswrap/syscall-mips32-linux.S \
+-      m_syswrap/syscall-mips64-linux.S \
+-      m_syswrap/syscall-tilegx-linux.S \
+-      m_syswrap/syscall-x86-darwin.S \
+-      m_syswrap/syscall-amd64-darwin.S \
+-      m_syswrap/syscall-x86-solaris.S \
+-      m_syswrap/syscall-amd64-solaris.S \
+       m_syswrap/syswrap-main.c \
+       m_syswrap/syswrap-generic.c \
+       m_syswrap/syswrap-linux.c \
+@@ -461,6 +429,29 @@
+       m_ume/main.c \
+       m_ume/script.c
+ 
++COREGRIND_SOURCES_COMMON += \
++      m_dispatch/dispatch-@VGCONF_ARCH_PRI@-@[email protected] \
++      m_syswrap/syscall-@VGCONF_ARCH_PRI@-@[email protected]
++
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++      m_dispatch/dispatch-@VGCONF_ARCH_SEC@-@[email protected] \
++      m_syswrap/syscall-@VGCONF_ARCH_SEC@-@[email protected]
++endif
++
++if VGCONF_OS_IS_DARWIN
++COREGRIND_SOURCES_COMMON += \
++      m_dispatch/dispatch-@[email protected] \
++      m_syswrap/syscall-@[email protected] \
++      m_mach/mach_traps-@[email protected]
++if VGCONF_HAVE_PLATFORM_SEC
++COREGRIND_SOURCES_COMMON += \
++      m_dispatch/dispatch-@[email protected] \
++      m_syswrap/syscall-@[email protected] \
++      m_mach/mach_traps-@[email protected]
++endif
++endif
++
+ libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \
+     $(COREGRIND_SOURCES_COMMON)
+ nodist_libcoregrind_@VGCONF_ARCH_PRI@_@VGCONF_OS@_a_SOURCES = \

diff --git a/dev-util/valgrind/valgrind-3.12.0.ebuild 
b/dev-util/valgrind/valgrind-3.12.0.ebuild
new file mode 100644
index 00000000..e9e5899
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.12.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org";
+SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos 
~x86-macos"
+IUSE="mpi"
+
+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
+       epatch "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+       # Changing Makefile.all.am to disable SSP
+       epatch "${FILESDIR}"/${PN}-3.7.0-fno-stack-protector.patch
+
+       # Don't build in empty assembly files for other platforms or we'll get 
a QA
+       # warning about executable stacks.
+       epatch "${FILESDIR}"/${PN}-3.12.0-non-exec-stack.patch
+
+       # Allow users to test their own patches
+       epatch_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)
+       # -m64 -mx32                    for multilib-portage, bug #398825
+       # -ggdb3                segmentation fault on startup
+       filter-flags -fomit-frame-pointer
+       filter-flags -fstack-protector
+       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
+       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";
+}

Reply via email to