Remove old; add a patch to build with glibc 2.16 (bug #424992); make sure to disable frame pointer omission as upstream seems to be concerned about it.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

6 files changed, 36 insertions, 168 deletions

diff --git a/dev-util/google-perftools/ChangeLog b/dev-util/google-perftools/ChangeLog
index a7452d52aa5f..9b5c5783519e 100644
--- a/dev-util/google-perftools/ChangeLog
+++ b/dev-util/google-perftools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/google-perftools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/ChangeLog,v 1.18 2012/07/06 00:57:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/ChangeLog,v 1.19 2012/07/09 10:49:06 flameeyes Exp $
+
+  09 Jul 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/gperftools-2.0+glibc-2.16.patch, -google-perftools-1.10.ebuild,
+  -google-perftools-1.9.ebuild, google-perftools-2.0.ebuild:
+  Remove old; add a patch to build with glibc 2.16 (bug #424992); make sure to
+  disable frame pointer omission as upstream seems to be concerned about it.
 
 *google-perftools-2.0 (06 Jul 2012)
 *google-perftools-1.10 (06 Jul 2012)
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index c6f266d17776..996674305191 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,24 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST google-perftools-1.10.tar.gz 1257663 SHA256 bc458dfb65a2b1ba6ac0ee2f81705d6224c5aeeced7262cd15f6c84066ab2090 SHA512 ba95b319476c55eee87f882e0c1a091ed03f2fb34eae92c6a69e992c9b69d5ece347617a739150006ea833ca12ff39bda2b563534517ad391925b9d056435454 WHIRLPOOL 2078fdaf7dbe78946a7d32a6d94cac0268c82f1315a93e0d1212d665ef6dff600086f51994344f1ee714a9a398d39b5ba0c7fcc04262710c3dc5f731b711bdf0
+AUX gperftools-2.0+glibc-2.16.patch 604 SHA256 abb19fd87ce092fc0cb0a4a5964834ec97b12d2462bc2b8bd8668c4ca71fcea5 SHA512 aa9b94c4712227b6414fc34a47154f416b120004c81704ab181c7985b6dce60bf1d98e4175678fb445cd59bb6c85d4d7bb0a093e186ecc9f115bc841d27cb964 WHIRLPOOL 75866b1e0e17ccc206459b31e284f7892d7e03c4cd862f8f6d66b374887aab938e9d79115228b7a7258f6bddd2439348fb48f67581744b9fdad1b4f6ae8079ef
 DIST google-perftools-1.8.3.tar.gz 1265062 SHA256 6ad744b34abb24312631740d9912f4667993b02e5f59b91246c31a2a911a9d59 SHA512 c6938391d182982ba6a87cd3d023e5fdf3501c42aecb951504e2fc97ce9e5bb2a6e6a577504ddbe89220b45ae47e58ce3e68f84aa45ff238d949dee4fc765b51 WHIRLPOOL 70ef15f25451a0f3eddb92e948e6d7d2e46a7ee8684636ddff312d5f0dda1429a7fe3f1f6756f0a979e4957b09c47513ddad9504415795e9e82ba51188672fdc
-DIST google-perftools-1.9.tar.gz 1245683 SHA256 e56e6b46781ad0fb87f225dc06e0b5634a7ee526bce72d0e7ab9cd704939733b SHA512 5361b875b2800445d16065127d3fb9fef77f738f634634e4f63b71141ec9ab5bace20875601f255e604d9d0d6dfd404a3c2a9501b2e98002f7918d5fa6e49b51 WHIRLPOOL 6a0a0bc87c5693e3e3a9e4f17a4a85a2e7ae1053d0a745ce1875ceb7877c57f2b250371e58cbe1ccd971911fceec34702b9d084bec67a60e0d34a98279002d94
 DIST gperftools-2.0.tar.gz 1261243 SHA256 7de3dd91f018825b1e7d332af1edace15c6211f430186febede1835069861080 SHA512 61bf7a26974058912a4165cbc363351bc735599d36ab569dc7e84a75a690adbc17a4178512a57469fc7c17befaad2a271ef4ea5c29a36b664153938939269926 WHIRLPOOL 4f49a7da976040cacdecb8e18294b09fbfe276422ba35058476a14a3c1df072f8748d70f738adafa03a3a445701ed32b6232f13962d8ec8c5a968652414797a6
-EBUILD google-perftools-1.10.ebuild 1961 SHA256 e96d04ce730228e1e890fd6d495157a23338e8984ce3b63c3a05005d770c90a1 SHA512 2496412abccd5357b67ecf39f5c71e9310bea222abb151b475d6fc007b9e90f205b2f79ac5637495a4857dbbe4a2d3bce054e761251ce6dc156fb5198c43a458 WHIRLPOOL 447852feb456a844c01ddedf81d803b5775eeb948462fcd0581c00fb741ca22cf6376343dbc70cd215dc163f94d719d9941b583ffc8725559e2779e9cea216b1
 EBUILD google-perftools-1.8.3.ebuild 2135 SHA256 2c11a92f50262cc008e0910c7c45a1dcf2cf821d6716652a5ad1d9cb97f322f6 SHA512 45616015e84bb925cba006ed96f8715272d4cf7aab632cb95bf9b1f71f36309cfee6e2169f2d31e68469c0632772f8e2c3565b606be93f8420f4d6e6d073c345 WHIRLPOOL 6ceab6a0edd1c000c53ed719da0bdefaf9e505eb600b472ae960626609fb7c4e8a35dec0ea3a38e005cd867aa2fbe54c231a8cdcceb47c9bae71d848de3a3806
-EBUILD google-perftools-1.9.ebuild 1972 SHA256 0ccca132ce78a88162576742222d264cd17f0c3d686b6d8938808a68adc8ab4b SHA512 ece690359d44f08abbe4f69c17ef98d35a62c481c12085129eb6b28a5fff8e21f1b32108061e1bffaa21e3eaca816b37f734d36dd5c9476eef4b838c04ed10bc WHIRLPOOL 95067b4b5936dc464448ecb78d5b876777960adc9bb4b7172d28dbf75f1474c208c21a63567e8f0a3be661db05f5276d567dea375a0077c344344100139eb172
-EBUILD google-perftools-2.0.ebuild 2012 SHA256 258ce26763ed1a6e13b056f719e5f7b53550ce7ca61a1ca28b971c97a4a95339 SHA512 ce87dc1b29ecfb0506a247645d222b15a6bb81d592ceaf87c53d19d2e24bbc59d06d460127d160789dddbc30287fa891fd732067df1f6a1ad0cb2dae0165e3f1 WHIRLPOOL 4c718ecef736ef5282cd83707e5cb9c80706d9d4cea9f943724f9f328ebd57ad20f874c0a3e6cf371ae88e3099bb1f6f2ee282c86316e356c199629cefe3e3c5
-MISC ChangeLog 3680 SHA256 c246eb4f8f2c86ed88d8a2f91b7d796fca001e558f2153c50777ddac9cfe8d90 SHA512 49e85bc91ecbbec53ff81b2b79af0fea77ed282f7462e85e1664cb7714f0233314b0bc5b013e4eeff60a2593749e120711a8695f4d54cbdfcd9b5e4b7d8d8d82 WHIRLPOOL 6a81d9d6434460a7a405ec6d37001804e61ee9cc6903fc2894852a6d55a85360536cdae4ff4f99418a1c8c182dc473a82482a855504b37a014f821fc4ec2533a
+EBUILD google-perftools-2.0.ebuild 2102 SHA256 41523355d60b9135ba09a32c1e6edcfd1021d49a7ca6c6ed69ad402365c716f5 SHA512 7767ed302bd162846e87745dcd63213125709a51705146dc21b329a8328db9bb8b5976ba9c734cb086fb8057e1d58a20e84a762cc1a23e22e78c2a26d4fba637 WHIRLPOOL 023ceed1c55107872b41ee6408596b4bf6d730d4f0fe4fdcbd14cc7b317961e5dfc214e33a6cb26acd5dc8669abd026f46221c09def036342c508a2afda6b735
+MISC ChangeLog 4027 SHA256 cd32f4b58101181287e48dbbf2b5e7d3b1485d7d4fe61a38f1f2c2931bf5044d SHA512 39a1ebb3238674f2c14082d9eebe6491a9e4fe8a297ef1a978c275f8f360ab4fd5a23b5a5b3e57ba40839e45123ae3a668324d5d1bec6d1221419babd7d4b504 WHIRLPOOL 59c572507e1cbd8459afc2b006f250605596e36235ce675fad71f3c9d8320c8ed93bc877e553e7c862be08ff84d8d480316117a84f053650635f8a97a1eee961
 MISC metadata.xml 774 SHA256 bbe347d13e3f9956f9746f532aeb9bdee168509114053d2d0e8212aba51ca649 SHA512 c3b7dd68c57518617c41b435bc660cc6874dd043eff716e54672397ee1c3120126e6814a84a56e64b1ce03dbbf628fca370a491221e2008fb70b301c7a562510 WHIRLPOOL 9d94a18600a269b3589437e9d769ce2a37ed36d4e0e722aebaed4283694266cc0ff53430a9a831e8e3652d82348938d94c8ea6b0a91de8581cbe7ae629ff08c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP9jgIAAoJEBzRPIrUMBNCtqMH/itRLCu5snHlyJC4XQCATD25
-YI38bDZXAQuuKNo44rdmOVrOhoYeLdc1fdtov2csRQNqJWvw1njSmCgDjAaETZnZ
-Vhr3/krikAdzinC7xy3mR8Je3GC94YEm25ZqhpGKbgvKPbDSPWV51XuCtdfitvZ9
-Ek9i8u728hOqbLyOm9oKqM1PVQ995G1tBux47VV2l5g0yVDKL/h/CFuSIx/o3534
-f2IdPzrUzLe1MWmC0leSijprkh1HxOBFFL3jh3Kg0kto++cgkQF0TJxU4lYDl7k+
-LhUHCMNmdCLutEVpTfi8PyevnRChZNytY3mHRxG/zZFUe7gUH/pSsgmRYqwfBYc=
-=7EyC
+iQEcBAEBAgAGBQJP+rdvAAoJEBzRPIrUMBNCZ9cH/iUwx9SaIKvUky+puaZH3GfJ
+Wy7vHW8oNqhHiATw8Pape0NJglywgqUbf6JblbnXcyexLvsgy29GfTJVKV9tiAY8
+F3UG3jG1HxtJBJVfOJmcLYDjrF+lyDmikqoE5B1986XXJEsnTwE4FN4ziJqCFCze
+KFVyxxXh+PBjyF+l36lh0nnFqYMHntrB96EYi9Xg5RnjRaQJNo6elLVW1tq3B0Gh
+NOIVEmw0OPYrbn4p+umSxCdsfqzCHK0Naz4SvUgAuTaCWmu9Qlj1goC5M23d8kST
+NiBY0wZ9OJffxLzhcZ9+XKFu1vlxnvQLSEomXVDaO35bCV6lFSYarl1AWmeGrQ0=
+=9pge
 -----END PGP SIGNATURE-----
diff --git a/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch b/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
new file mode 100644
index 000000000000..b17e0d57f5fb
--- /dev/null
+++ b/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
@@ -0,0 +1,13 @@
+Index: gperftools-2.0/src/base/linuxthreads.cc
+===================================================================
+--- gperftools-2.0.orig/src/base/linuxthreads.cc
++++ gperftools-2.0/src/base/linuxthreads.cc
+@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
+ /* Signal handler to help us recover from dying while we are attached to
+  * other threads.
+  */
+-static void SignalHandler(int signum, siginfo_t *si, void *data) {
++static void SignalHandler(int signum, struct siginfo *si, void *data) {
+   if (sig_pids != NULL) {
+     if (signum == SIGABRT) {
+       while (sig_num_threads-- > 0) {
diff --git a/dev-util/google-perftools/google-perftools-1.10.ebuild b/dev-util/google-perftools/google-perftools-1.10.ebuild
deleted file mode 100644
index 8d102c4ba6a7..000000000000
--- a/dev-util/google-perftools/google-perftools-1.10.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-1.10.ebuild,v 1.1 2012/07/06 00:57:34 flameeyes Exp $
-
-EAPI=4
-
-inherit toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="http://code.google.com/p/gperftools/"
-SRC_URI="http://gperftools.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="largepages +debug minimal test"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		makeopts="${makeopts} noinst_PROGRAMS= "
-
-	# don't install _anything_ from the documentation, since it would
-	# install it in non-standard locations, and would just waste time.
-	makeopts="${makeopts} dist_doc_DATA= "
-}
-
-src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		$(use_enable debug debugalloc) \
-		$(use_enable minimal)
-}
-
-src_compile() {
-	emake ${makeopts}
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sanbox is enabled."
-			ewarn "See http://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install ${makeopts}
-
-	# Remove libtool files since we dropped the static libraries
-	find "${D}" -name '*.la' -delete
-
-	dodoc README AUTHORS ChangeLog TODO NEWS
-	pushd doc
-	dohtml -r *
-	popd
-}
diff --git a/dev-util/google-perftools/google-perftools-1.9.ebuild b/dev-util/google-perftools/google-perftools-1.9.ebuild
deleted file mode 100644
index 81a00e9bf4b9..000000000000
--- a/dev-util/google-perftools/google-perftools-1.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-1.9.ebuild,v 1.1 2011/12/24 15:11:26 flameeyes Exp $
-
-EAPI=4
-
-inherit toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="http://code.google.com/p/google-perftools/"
-SRC_URI="http://google-perftools.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="largepages +debug minimal test"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		makeopts="${makeopts} noinst_PROGRAMS= "
-
-	# don't install _anything_ from the documentation, since it would
-	# install it in non-standard locations, and would just waste time.
-	makeopts="${makeopts} dist_doc_DATA= "
-}
-
-src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-
-	append-flags -fno-strict-aliasing
-
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		$(use_enable debug debugalloc) \
-		$(use_enable minimal)
-}
-
-src_compile() {
-	emake ${makeopts}
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sanbox is enabled."
-			ewarn "See http://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install ${makeopts}
-
-	# Remove libtool files since we dropped the static libraries
-	find "${D}" -name '*.la' -delete
-
-	dodoc README AUTHORS ChangeLog TODO NEWS
-	pushd doc
-	dohtml -r *
-	popd
-}
diff --git a/dev-util/google-perftools/google-perftools-2.0.ebuild b/dev-util/google-perftools/google-perftools-2.0.ebuild
index 8b17ece415ef..c76592c54777 100644
--- a/dev-util/google-perftools/google-perftools-2.0.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-2.0.ebuild,v 1.1 2012/07/06 00:57:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/google-perftools/google-perftools-2.0.ebuild,v 1.2 2012/07/09 10:49:06 flameeyes Exp $
 
 EAPI=4
 
@@ -38,10 +38,14 @@ pkg_setup() {
 	makeopts="${makeopts} dist_doc_DATA= "
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${MY_P}+glibc-2.16.patch"
+}
+
 src_configure() {
 	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
 
-	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
 
 	econf \
 		--disable-static \