Do perl thread detection at runtime rather than configure time #343439 by Muelli.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 84 insertions, 18 deletions

diff --git a/sys-devel/automake/ChangeLog b/sys-devel/automake/ChangeLog
index ff39c47a3777..28f527c0e626 100644
--- a/sys-devel/automake/ChangeLog
+++ b/sys-devel/automake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.180 2013/01/03 18:45:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.181 2013/01/14 17:37:20 vapier Exp $
+
+  14 Jan 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/automake-1.13-dyn-ithreads.patch, automake-1.13.1.ebuild:
+  Do perl thread detection at runtime rather than configure time #343439 by
+  Muelli.
 
   03 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org> automake-1.12.2.ebuild,
   automake-1.12.3.ebuild, automake-1.12.4.ebuild, automake-1.12.5.ebuild,
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
index 462bf4a2b1cb..9e49227c2d45 100644
--- a/sys-devel/automake/Manifest
+++ b/sys-devel/automake/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX automake-1.10-ccnoco-ldflags.patch 901 SHA256 98c85d873eac326a4b6c6afde25d887da85a45bae4bb4fad853a40e46fba7af5 SHA512 bc823b9387277c06944faef1abc4277c4f6e8024cf9cdfdfb2b9f333d578cedb6c5071fbf49ee420dbe696e8a8bda4583829e3eca225e9ba7f5d0ca0e2639ca3 WHIRLPOOL 362418007ee70757c2908d43600087ccfcc950a2a5d0cac638cd95417738ee5e848d1248466c607e062d96c2f00d65ddb8743a7ac3186d1445aae19798d6b949
 AUX automake-1.10.1-tests.patch 3283 SHA256 107f073536a7104d5b25dc7ff80933c22f44f847789435f5678c01090890506b SHA512 4876eddcd2f45d472b8eadfa5684d5c662b06b057dd6a75b017d9e9f94a14056d299cc4e5e4c3d00bd493b0009433a4d83f6a2ff2867f22db9637e44e2af717a WHIRLPOOL 70881c93065b70be2e8d537052fcfb205fc31e748031597d5dc3362121896fd0e22f0a0673651e63e8d205debc273a7d041dbc3882296146966cd63e9bae9120
 AUX automake-1.10.2-bash4.patch 644 SHA256 c07951416ab13e34d5090892cbba5e4d0e6e351fef1ee540d11b0da88d6ea677 SHA512 7d89922410162b4248dd154d9c71b51ae211dd7bd4a99734a092758cbccb5504bceb59af476f399c515932e5bea838fa71e3dfd30df3ca5d3d640481d7a86ef1 WHIRLPOOL 68491fc0e19cf900644b3a1ea767208581dbaeddc220e2b612a58cdd62358be4155c5527bc8449a3fbbdba6357f41ca409067377c4b01b32239d3cd48bef185f
+AUX automake-1.13-dyn-ithreads.patch 2126 SHA256 5f97e051c780205696c6173bda36b1ba661beadf0b66ed564b7a7e6abd569747 SHA512 7a3795cb8b14b347a296abd410f3a740401e796a06317e52fa1ef8b0866099f71965f7fb12fd85db2ccc7445f310a4dbff6870d8a63e72c49ed6f8ca9da97277 WHIRLPOOL 4e63dacb6fd3fcdb974d38ca65fa943232461b0c543b3c092c1d53ff4ad51ccc6ce74dbf56061f262dd5e29ff078eae053b4967dfafca0578fc133760f207108
 AUX automake-1.4-CVE-2009-4029.patch 2186 SHA256 29a556dee26b3081ecfc5b04eda8c3e5430a3e48a37f156ffc54b1d2132d9275 SHA512 cf65172ee59f91869b13292204e9744fb385a2cf13a17dab0e1dba5b1f403da55d1bd73448b00d81f46de2c9e7de1347e7b6868cd6f4b5e97e255a5c206d2d31 WHIRLPOOL c551e1f23d080c4052cc59b30bad69be59e16737a42a2acc3a7b752c613d2ab6726daf23eb6814aab6457d3efd1c68309c7766fc252f323e925fa27992592ee4
 AUX automake-1.4-ansi2knr-stdlib.patch 249 SHA256 8a29de01493b888f392388a0cffc0e4e2c0f4d81bc2ff34a4b65d27fab804210 SHA512 db8d0e71e702e236b1e9d6f2ff949b6981a02da4ec143219ea10327f7c6dd9845f100c62c715b6cda46082dbc2cfb69bd50aea64d5fccc5bbd6fe81351a0012c WHIRLPOOL c007133401ba437cea638c17486819c0e866d7050b7e9f348e36d03721d2fa7942a4ff19fa66a3d648e37f126c984ad22eea00941413d9588280eea81deb4091
 AUX automake-1.4-libtoolize.patch 542 SHA256 1620b99a3043c66d6e6ae8a369733a1042ff5deec08ab11c727dea15032a684b SHA512 1c9ee6d970cc9eb393e959c12518173ac49ec88d07ae52ca026807b52502a52f3f019916503e1fc444ba83bc21a6df74a95abadbc2cf938f79fd63299cd64846 WHIRLPOOL f2fa419cd4ccd5889929795d70358304d805fb2f4142b7987e8828050b575997d537c01a885effca25515b50697b1f23a6090a1f1a1314a9455e89d48ba64b48
@@ -48,7 +49,7 @@ EBUILD automake-1.12.3.ebuild 2279 SHA256 cb9ecacb3a33fc39026295e5091159ad95862d
 EBUILD automake-1.12.4.ebuild 2279 SHA256 9c92c49ef0ffb076858077481bfa81e093a9498e59e465d7e03c15a8ba19e13d SHA512 b2bfbec7796989866618e7b96c509557b56d071929e074acc00462360010145b12fa4bf68a717ac9cb4eca3b09b05a4800f6c953fe0ec753669385abd53762f6 WHIRLPOOL 2cfac5b23a38500013370f73c6da249b13fe3790b38a7ab6243f9ea8e4f73e7ba588d360f3466a1f755fd6d3e84e58c58f0004635b5775a7daa12ceb1d21d279
 EBUILD automake-1.12.5.ebuild 2279 SHA256 88ccedc9eb118f962d0977567651e93089a4a706a9d7aa5b16729a90633a1141 SHA512 07aa14e97c227c6d24d202584af03b351de38639a6fbd736fd16bd680e759c9fbf2a758b0bcc793518b4bd250f0a2fc396c38167ef974082c0a7a98cb621badc WHIRLPOOL da8072aabf174276cecbe478e0a53ece09b09fd8b7c69210e2ea24102cfe9e09282d4cc65caceb61607464ddd0f98b0c9a1a26201b90be639c9ce90b6e414d2f
 EBUILD automake-1.12.6.ebuild 2279 SHA256 d51e9e741cf4cd9dbedf4c3c0d99ff3bde399384178267a8c8c3714ca658f4e8 SHA512 702b7226efc981b6f91aeeeb3b98388abdc36e2c20c309e032125c866e9ee9010ce221e0d73efef000f604ff8e0f4effa005e925e690cadbbabe5f4047531f17 WHIRLPOOL 05a099d2710475005a89fab9cad45993de063438657835404435dab04c645e8f5a10ab8c4be8793463b90a02be98d18b9e3e38851dd49efde2c4648cdf73ae72
-EBUILD automake-1.13.1.ebuild 2294 SHA256 289dce6eb1b1768edb59fa6a9246952a0440d91f1121de84f8001228a00afafe SHA512 46e5b571b9a670fab9ac238ef1ab49f33fb9c51173056451fd1c8fdd4c0d3dfc00abae0a50f9398d1781347e03d8e3694815727498a6e13e5349dd10b9217435 WHIRLPOOL 6435b11af145d15cdcebdc87b3a61262f968eca411105aa167bee750588fcd92a7f84b2daa95b5a4cc2e3c432e6f64f23741e744e61c6c8cecdcf68d608ba081
+EBUILD automake-1.13.1.ebuild 2342 SHA256 3bd69d28ac1629a5942bd2d68881d4b67ba6126efff572a0799e9b8e51a77e53 SHA512 ca27b7dcec0607f058bebd72754803917bf948430582d93b3eab6ecc06068f653e06973aa39a5ff74533238a27390d65080771d770ac9fecd631931906bf7ea7 WHIRLPOOL c275f084bda6f59209408617797b82b17cde02ff948969013062927059e2c0d39110a8b0d6a681844108803955bc20668587fe1bdcba1686eeebcf8dff2a99b1
 EBUILD automake-1.4_p6-r1.ebuild 1813 SHA256 10d728b164429499a47e45cb23f50bb4d264f06917ce37caa43af6c7430bd024 SHA512 d650f390b2f0e1c160868a766e47377dafa5b4b3f272dd30761e723e2a2606b8d1b0b590515a8966447b11a832e68ad5fb552e02ba51de9a5776c644c227d066 WHIRLPOOL 39acef7ffc5aa53afcd762db869d4bb44db1d86dd9279ca9638944e65b1c861fc7c553b802ca527cd7638a3ce244269d293f6184630237cf114d7fa594ad8675
 EBUILD automake-1.5-r1.ebuild 1770 SHA256 77fed57734ee58938de42125104b96d4c97f4eeb4a815ee3f1c21954d3993b4b SHA512 23fdc1cbc829d85ab60f694c5a19fb15066fecbcca5f9e4b1bcb1aafdaaebc31c326bcd41219eff6bb05b68390311317254b154a9622bf0e6ce127624a505dee WHIRLPOOL bbe79d5867f56cf777fcbf01349176cef73e2dda0108c3ff5a5d064a92cd6eb399f6443a26f4a074feea62bb8dd21a05647d8f9b13b38f8bb27ff50c0caf2a01
 EBUILD automake-1.6.3-r1.ebuild 1498 SHA256 5aa8d9a63e5089de12e7b2ee26c9d319f55258c35e4e133b46fafbf40a6047d0 SHA512 754a39116c06f70397b62e819ee6f527c52ad3e4a35083fd13ace03b4f75e4f9c6681f37f304265aa22613a483f830da8388fc8ea2914c2011be831a4ed2f507 WHIRLPOOL d4e2db8c6d93172b8a16fb1533490fb52da9a0e327af81e7a27debf06d9b80d17329bbce074b2c77d3865588e8a74eedfb38c7b1a5ba5f53667d5a8e42768276
@@ -56,22 +57,22 @@ EBUILD automake-1.7.9-r2.ebuild 1672 SHA256 5b37193ad52fd8e6a8e7c3ba986e312a651b
 EBUILD automake-1.8.5-r4.ebuild 1689 SHA256 be13ca556177543788bbfcc4a4ee549a60a00b2ef5b10ea64ad1d2e1fefd224a SHA512 205be44e8c9a35b4521ad41cc48f148d8b643affb3a2e8d44db54727a3c756d53cb4837f33e17fab2fca6e979208da418b39fe565a761b1415ddc5b3c09e0217 WHIRLPOOL 6a7ea635c4f76ab9081b4b96e30867c6d8da36668dffdf395563a115b7a638c656c157691eddc4fb0942d6f5e9b3be640f62f43ccd748a16fd4185fdff550f18
 EBUILD automake-1.9.6-r3.ebuild 1926 SHA256 62ecf66997c7d56c2c3f8cab2ab38874ea675ff27d38578a6f9bda363d2824db SHA512 8b4fb340b2036ea382715133df3e0537373470c1cf7e439ce4d1842e0f58cf1fcc4a9a7610c22d809f92b37af7519aa35209817681284a6e9371299f0baac8ab WHIRLPOOL 09c3ba739bdd14a348c6751ef9b7eaf884f2fb584edfbf93c514679f48bdfd9088a963c9f2e46d6e492de65f893142140c9757f4b8b6262acead3e22d30d5d5b
 EBUILD automake-9999.ebuild 1644 SHA256 2ea8308822e6bd831206961f1f6e77419d68313666dc05522a2a9799f91db129 SHA512 b2ecd2a324235a3c9b9f0d658eb9caa6ed29ea30d940f3b308521af9f5983f69b96ef11d1e849bcdc5feffc2762b8b42859084a71dc01b16b29f32c77427bd8b WHIRLPOOL 45a41e12da47e5a89b0da18e347118399b647d443f2ad4ea167de5e3af7d6c68905eb43982945a1ed2c20dde6c3771921df210ee34aa703f81ddc80f76a5248b
-MISC ChangeLog 29096 SHA256 112b9d265636be20b0c97e99caec887b6e6f86dc829272c63d81cb6851127e06 SHA512 c4bd21ccae51bc04093fea437d5b99f2fb242a04af6c9b9ccc6290c0098699b1ec2510a64c0f104e3d625d55141e4b9b445259d29fd4c8b735a2cbdc7dbd6784 WHIRLPOOL ded39b5eaca5377244ea17ce45a181646a79ce5c7c4d5ecf2bc496720d7a98df7249a6289aada9005900b98c491bdb5b1da536849f970391b6652097ed9442c7
+MISC ChangeLog 29300 SHA256 1624036345080a120e8b0b267ae18254a6d3732ac6a689f445f0294d552b6260 SHA512 bf632c351b07d0fc209dee8990b029104a09df2c2d6efc56dabe24d68b76f6c2495589fce013d9171dbb06767f16b24707c3279dcb87d9e0fa70eadfdb1cfd70 WHIRLPOOL b2381a0c1a351b4f2a849066a5638b085acb1e1bc1ab79b7952200c6f5c49026c2a52c17e02e4a01284fc67e4832ea6f4da9eee4c75226a191d94f342a184ba8
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ5dJIAAoJELEHsLL7fEFWcHAQAIeowmSpmu+heUW5cEOMFkrx
-PnJUeyZKi5PNO6k+tkYkNUPt7UVqqCXuzp8R0gKFtpRifci449pDxpEg3BS2bid/
-avvaMQceaziMfZ9mMXyIB+9OWapLDqFZHxLLUQDYa4CVyEFAvd2N1lhAXnZVTi4d
-gwojiEkFTFTs9eIRcsOyzXOh/x/BYEWBJK/aITzRccOeaYuQqKoCdtwiqz57QTFq
-xrHrwbTcPSfxQCAVUtkU5IbKcXNWK+GOtTO8CrVezKl34xXmCC1coe9IgjbpMICr
-ghVRfSViWdTNJt0iI7fKuAjeLZnu5t0B6kPFQk/kCiyzW6vGfzVMc0B8cPe2VzNM
-v5l62+ltw5aj12XkQzpuOYXuKXxGfrQDOL9RdEzsSqzBPCTgM7MSiO4oSVKVKQGO
-Bs6nPpHWFOijdgdSRdih8f9vDRYofM8g2HKjn19ODOcsKJFMw3bJSoqrcTaKj24Z
-I3YhmKCiJuq+GVaolN8Cl8vur6256ytNh6s0/B1bnYqkC4o+P8f32IxRwtrNcYoT
-CInHhjJTcMzW99ODVLWi8Z/brLiZ05MrUREDKuQCOQtR4lyk9tPLkJkiOZcwrkJ/
-QovpM9UGD2/zQGuxkn+EEmyLFG16MarWgZ37VwM/Lv9JuPLV9sj91IohTsPHNuZO
-jCxm/lSptN08apaaUZAS
-=WHuv
+iQIcBAEBCAAGBQJQ9EMPAAoJELEHsLL7fEFWAe0P/jEKTdFAj1BrbnI6TPPXg1ZA
+YXUhWbYEV4v2ZXhLSSQW5hBYwZ6G32Ms9AqPit9XMExji4NgSTGIXTxinH+LykTm
+MLt7Xydd+Akcx1uXHrvy2iwigaKcoOJV8k0YMRvtzO6u6XVwWnx2rV/YVYFsLoAB
+1JnwIESL9xrgNHBeTyagd+u4kAOeZpMqwfiSKcU0qL9rentL4+yVrm0+oqfIEO7G
+6yyhXUkPo0AMw6tcJX84MSWyzqXkd3kFKVfciuF96lJvHeEzOgGZ9NHNiBc49978
+CfEctPgZLaRW6T+BDxj7Ot934daApJwbHR6sPbZNgbW1Jihu7SSqK/wrbfF3jbq2
+iAySNTOPF9H/MrCinw230icHi5PXuAbU5mTbejdxuy2Ilwt9zArvntkoGu8qM/2m
+lLOQEo0UJQAka2YWQ4xvrbLIxVqODtPYNRB36/M7RHTIesbtTxeaL3sKDlGGnOZv
+G6z4cLk9tHxTJ1gWFDY6Jp8PlAqUEpDIzCOeDbuk/aR8UvkYQq4qjPlzG8N1bOEB
+ifUs+AgZwnxmyBaWSKW6WAHtrSbO03VGFsB5JVoXBoMwnt6p4HqX/9WJTD//NaiQ
+vl85E3UNxKYG5TJFs+frInkrCYVN0P7Bgu6/pYT4awG8QgfuZdlphClWsRx4r32X
+0iIMectOCfxt9QVx60q/
+=QaPt
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/automake/automake-1.13.1.ebuild b/sys-devel/automake/automake-1.13.1.ebuild
index c5004817841b..34934a64dfab 100644
--- a/sys-devel/automake/automake-1.13.1.ebuild
+++ b/sys-devel/automake/automake-1.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.13.1.ebuild,v 1.2 2013/01/03 11:33:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.13.1.ebuild,v 1.3 2013/01/14 17:37:20 vapier Exp $
 
 inherit eutils versionator unpacker
 
@@ -23,7 +23,7 @@ LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 # Testing.
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
@@ -51,6 +51,7 @@ src_unpack() {
 		-e "s:(automake|automake-history)(.info|.texi):\1${SLOT}\2:g" \
 		Makefile.in || die
 	export WANT_AUTOCONF=2.5
+	epatch "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch
 }
 
 src_compile() {
diff --git a/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch b/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch
new file mode 100644
index 000000000000..f790e7724c93
--- /dev/null
+++ b/sys-devel/automake/files/automake-1.13-dyn-ithreads.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/343439
+
+From 182626687f2640609f8eb28ad1b04b078342f2c7 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 12 Jan 2013 00:19:40 -0500
+Subject: [PATCH] ithreads: use runtime (not configure time) detection of perl
+ threads
+
+I can't imagine the runtime checks being a big runtime penalty, so there
+shouldn't be a need to do the checks at configure check and hardcode the
+result in the generated automake.
+
+With the current system, it means if you change your perl config (build
+perl w/threads, build automake, build perl w/out threads), or deploy a
+compiled automake package on a different system (build had threads, but
+deployed system does not), you get errors when trying to run automake.
+
+So take the logic from configure.ac and move it to the one place where
+PERL_THREADS is used (lib/Automake/Config.in) and do the version/config
+checking at runtime.
+
+* bootstrap.sh (PERL_THREADS): Delete assignment and use in sed.
+* configure.ac (am_cv_prog_PERL_ithreads, PERL_THREADS): Delete all code
+related to these two variables.
+* lib/Automake/Config.in (perl_threads): Initialize to 0, and only set to
+1 if the perl version is at least 5.007_002, and useithreads is in Config.
+
+Copyright-paperwork-exempt: yes
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
+---
+ bootstrap.sh           |  2 --
+ configure.ac           | 26 --------------------------
+ lib/Automake/Config.in |  9 ++++++++-
+ 3 files changed, 8 insertions(+), 29 deletions(-)
+
+diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
+index fe6ef9d..885e74e 100644
+--- a/lib/Automake/Config.in
++++ b/lib/Automake/Config.in
+@@ -33,7 +33,14 @@ our $PACKAGE_BUGREPORT = '@PACKAGE_BUGREPORT@';
+ our $VERSION = '@VERSION@';
+ our $RELEASE_YEAR = '@RELEASE_YEAR@';
+ our $libdir = '@datadir@/@PACKAGE@-@APIVERSION@';
+-our $perl_threads = @PERL_THREADS@;
++
++our $perl_threads = 0;
++# We need at least this version for CLONE support.
++if (eval { require 5.007_002; })
++  {
++    use Config;
++    $perl_threads = $Config{useithreads};
++  }
+ 
+ 1;
+ 
+-- 
+1.8.0.2
+