Retain old build behavior with automake-1.11.2 and below, bug #397429

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/dev-util/valgrind/ChangeLog b/dev-util/valgrind/ChangeLog
index e27780aa88f9274b419af41c5f78e7ed6083b3f5..f113ba923375bb4210bdea0d3fe584a5ffa68170 100644 (file)
--- a/dev-util/valgrind/ChangeLog
+++ b/dev-util/valgrind/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/valgrind
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.132 2011/12/21 15:47:15 josejx Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/ChangeLog,v 1.133 2012/01/08 15:47:05 blueness Exp $
+
+*valgrind-3.7.0-r2 (08 Jan 2012)
+
+  08 Jan 2012; Anthony G. Basile <blueness@gentoo.org>
+  +valgrind-3.7.0-r2.ebuild, +files/valgrind-3.7.0-automake-1.11.2.patch:
+  Retain old build behavior with automake-1.11.2 and below, bug #397429
 
   21 Dec 2011; Joseph Jezak <josejx@gentoo.org> valgrind-3.6.1-r1.ebuild:
   Marked ppc/ppc64 stable for bug #387429.

diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index a3b954044358989b11fd1f4b715aa718a56470ba..6e5a3cc189d850a75310146784a4fc2cb0a51b6f 100644 (file)
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX valgrind-3.2.3-pkg-config.patch 670 RMD160 26d8f37182da50110e4c40c5be0ec9d06185d7fd SHA1 83bda9ceebc7c13586c5bcd49c809c72e2e7511d SHA256 ffd44e653b95326ef1915f406e35cca9a0898ba3e101965d0f6e4229c72c38d5
 AUX valgrind-3.3.0-only64bit.patch 580 RMD160 f4304ad005586541400e6c1466dabf8cdaac2b72 SHA1 7c890914ec0fd53b8de662783b230ec78e57e345 SHA256 23485d4b03c66db3c58f3a7e9d0aca439a50b87ea60f2edaaf94229b54a80ee9
@@ -22,6 +22,7 @@ AUX valgrind-3.6.0-strcasecmp.patch 3786 RMD160 7887dd9e2dc9e5934a25106c6413458b
 AUX valgrind-3.6.1-glibc-2.14.patch 1078 RMD160 d0a853f9d65e821e3586fd3058db37bb2139e251 SHA1 98b0ea183b90ddf5aee4f68f31f6bf5e818ba4ac SHA256 c76f3f965ebd98d469e6431780267dfb7ad1a58da0ab397ebfc21a08e98828a5
 AUX valgrind-3.6.1-linux-3.patch 392 RMD160 1b654f96b339c15e1e89d41d8dfa01fc5be3cd60 SHA1 c191a54cf24952e103ee1a882fce4c50c119c81d SHA256 056b6fc872ed0be91a2000e599a9431e1bc78efa7ee2ac986f74f2e450f28582
 AUX valgrind-3.6.1-user-enable-qt4.patch 3100 RMD160 d5130569c986714dbd39af5354a1f5c9a039d019 SHA1 6252b9220f8ec6b3e336802101eb296b53209c97 SHA256 ffe139eabb1340a6f004e4a9858d36cf19616bb1c4156395ea2b3b6600a23217
+AUX valgrind-3.7.0-automake-1.11.2.patch 1436 RMD160 f0c1275c3eaebf8765232dde57557903ba1e07bc SHA1 1604c3060d51dd7ebbe554901ec19632924d4520 SHA256 c5cf935bcb74c1e890183602d34a3d86eae65844cfe034e517dc3667e48b278d
 AUX valgrind-3.7.0-fix-gcc-regex.patch 1723 RMD160 f4fdc113f58d7151315f6a65a262471d4f8a75db SHA1 7ed537bcc935a40001a3d11fbff353e9cee342d5 SHA256 3a587d7dcc1ed447cc006cfef0cfb3597f17c96ac8adc7adbdc14d313a1d6852
 AUX valgrind-3.7.0-fno-stack-protector.patch 554 RMD160 df9a699ff35cf867e17b04a200c5e68015955167 SHA1 ed6368061d47448a597f6a2a9635f66e244b5a13 SHA256 83ed90a0e8a8b06dca8aad4e7f1a12e3c84621d502427c0913b72740b310f479
 AUX valgrind-3.7.0-non-exec-stack.patch 5644 RMD160 86178ee97653b2b4074e98e2342c5104583fa759 SHA1 8074a41b2e8915fa3a63ce827a14088949057bed SHA256 4de10480b6e27379083203df3cfedccdace68d0aad611440478ca2f1b2f89751
@@ -45,12 +46,13 @@ EBUILD valgrind-3.6.1-r1.ebuild 3176 RMD160 f415387b3262de66da0a856f3ae941c75494
 EBUILD valgrind-3.6.1-r2.ebuild 3274 RMD160 73bb4329831338e42ed89da3bce708734200e37e SHA1 2e88d94fe6bb219147e560d9a7110eac168e0fbd SHA256 76c3a09da89fee55a1d2fc4de723013183ffa6dca020eb91bc508e7348cb9858
 EBUILD valgrind-3.6.1.ebuild 3068 RMD160 5ae01b6484705ad9c7e7bf7e888a355054e6e4c2 SHA1 bcf3c5107a61fbfabbee441d3a304a9ffad8f672 SHA256 93eea5c2c81b7b92ba250706bec21d21575a88c5d426b37096409772119f4e0f
 EBUILD valgrind-3.7.0-r1.ebuild 2720 RMD160 4d4a707fac4c62a68d3de02ac44e23b8f641a4e1 SHA1 6283fed760b8fcd3391639e0cc8d92d398b110f6 SHA256 93b9f2dc0f5b24f17b4ae070740641b03de1d02b38f9a1bc808e660d31deea94
-MISC ChangeLog 22028 RMD160 c79d1ae7beeb9998ef762350446876dd71eb1b43 SHA1 d2f4b8ec33699372c93f2c4c9421bdd400ecc0b1 SHA256 3417679a22e45707ceac62d9d0f5ea815d25c32ad1a90124d5dfc82ccbba6632
+EBUILD valgrind-3.7.0-r2.ebuild 2827 RMD160 6a46c8714a69acb97de30e8664811e90bddef94d SHA1 8f13a7dc991e741c3a919a04713ff4be0d86931d SHA256 3353108fb80a77d6ad38fb1f20410690832766d458abaaf2d42d4688be41d033
+MISC ChangeLog 22266 RMD160 408c3b6be44a9c70752c310269f91bb18fc20b59 SHA1 2ac8a5a6f13c6be985f13f0f01fada0755a593f9 SHA256 422d4e8179a668aa35640addc0929fb3bffe9182a323bd34b8673571a5da3d7e
 MISC metadata.xml 980 RMD160 7441340fd2659400fb15d857446dac8f7b3f1176 SHA1 07af40cb309fcd80ca639dea5110b1109ce72427 SHA256 513a0d653dfae858a7f426745bd0abe5dcbc8748d468310fdce156e0e21e2cd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7x/4kACgkQcsIHjyDViGRN+gCglFLwCchIURHQkClYeqOiVZTD
-kQYAoMsBCXaawaiMmZlYdotTG9U+wLG3
-=L6/J
+iEYEAREIAAYFAk8JuoIACgkQl5yvQNBFVTVEUACgl7e4/Jgx4onMFJoNCOtKH70v
+PbIAoIOYwxrqvXhVMaOZxNmNVJJQh5iK
+=FrMZ
 -----END PGP SIGNATURE-----

diff --git a/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
new file mode 100644 (file)
index 0000000..b0b57bf
--- /dev/null
+++ b/dev-util/valgrind/files/valgrind-3.7.0-automake-1.11.2.patch
@@ -0,0 +1,37 @@
+From: Gregorio Guidi <gregorio.guidi@gmail.com>
+
+Retain the old behavior of the build system even with automake 1.11.2.
+
+Reported-by: Oleg Bulatov <dmage@bk.ru>
+X-Gentoo-Bug: 397429
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397429
+X-KDE-Bug: 290719
+X-KDE-Bug-URL: https://bugs.kde.org/show_bug.cgi?id=290719
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+
+diff -Nur valgrind-3.7.0.orig/coregrind/Makefile.am valgrind-3.7.0/coregrind/Makefile.am
+--- valgrind-3.7.0.orig/coregrind/Makefile.am  2011-10-27 12:55:06.000000000 +0200
++++ valgrind-3.7.0/coregrind/Makefile.am       2012-01-06 17:23:48.717115986 +0100
+@@ -495,7 +495,8 @@
+       m_gdbserver/powerpc-altivec64l.xml
+ 
+ # so as to make sure these get copied into the install tree
+-pkglib_DATA  = $(GDBSERVER_XML_FILES)
++vgdatadir = $(pkglibdir)
++vgdata_DATA  = $(GDBSERVER_XML_FILES)
+ 
+ # so as to make sure these get copied into the tarball
+ EXTRA_DIST  += $(GDBSERVER_XML_FILES)
+diff -Nur valgrind-3.7.0.orig/Makefile.am valgrind-3.7.0/Makefile.am
+--- valgrind-3.7.0.orig/Makefile.am    2011-10-26 23:24:45.000000000 +0200
++++ valgrind-3.7.0/Makefile.am 2012-01-06 17:23:17.445114847 +0100
+@@ -61,7 +61,8 @@
+ # default.supp, as it is built from the base .supp files at compile-time.
+ dist_noinst_DATA = $(SUPP_FILES)
+ 
+-pkglib_DATA = default.supp
++vgdatadir = $(pkglibdir)
++vgdata_DATA = default.supp
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = valgrind.pc

diff --git a/dev-util/valgrind/valgrind-3.7.0-r2.ebuild b/dev-util/valgrind/valgrind-3.7.0-r2.ebuild
new file mode 100644 (file)
index 0000000..f4995b3
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.7.0-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r2.ebuild,v 1.1 2012/01/08 15:47:05 blueness Exp $
+
+EAPI=4
+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"
+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
+
+       # 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
+
+       # Yet more local labels, this time for ppc32 & ppc64
+       epatch "${FILESDIR}"/${PN}-3.6.0-local-labels.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.7.0-non-exec-stack.patch
+
+       # Fix the regex to get gcc's version
+       epatch "${FILESDIR}"/${PN}-3.7.0-fix-gcc-regex.patch
+
+       # Fix stricter use of dir variables, bug #397429
+       epatch "${FILESDIR}"/${PN}-3.7.0-automake-1.11.2.patch
+
+       # Regenerate autotools files
+       eautoreconf
+}
+
+src_configure() {
+       local myconf
+
+       # -fomit-frame-pointer  "Assembler messages: Error: junk `8' after expression"
+       #                       while compiling insn_sse.c in none/tests/x86
+       # -fpie                 valgrind seemingly hangs when built with pie on
+       #                       amd64 (bug #102157)
+       # -fstack-protector     more undefined references to __guard and __stack_smash_handler
+       #                       because valgrind doesn't link to glibc (bug #114347)
+       # -ggdb3                segmentation fault on startup
+       filter-flags -fomit-frame-pointer
+       filter-flags -fpie
+       filter-flags -fstack-protector
+       replace-flags -ggdb3 -ggdb2
+
+       if use amd64 || use ppc64; then
+               ! has_multilib_profile && myconf="${myconf} --enable-only64bit"
+       fi
+
+       # 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 "${D}"/usr/$(get_libdir)/valgrind/*-*-linux
+}
+
+pkg_postinst() {
+       ewarn "Valgrind will not work if glibc does not have debug symbols."
+       ewarn "To fix this you can add splitdebug to FEATURES in make.conf"
+       ewarn "and remerge glibc.  See:"
+       ewarn "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+       ewarn "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+       ewarn "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}