Fix building in parallel #189671.

Package-Manager: portage-2.1.3.16

6 files changed, 52 insertions, 24 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index 458082a4a4b9..0ea8aececb6c 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.157 2007/08/24 22:11:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.158 2007/10/28 19:23:00 vapier Exp $
+
+  28 Oct 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/bash-3.2-parallel-build.patch, bash-3.2_p17.ebuild,
+  bash-3.2_p17-r1.ebuild, bash-3.2_p25.ebuild:
+  Fix building in parallel #189671.
 
 *bash-3.2_p25 (24 Aug 2007)
 
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 84993e0f1319..e56c356969b2 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -185,6 +185,10 @@ AUX bash-3.2-loadables.patch 5355 RMD160 4a219e7e354f9ae36b7141d04aa3326d19ce1ab
 MD5 dc3cd230f4897027bd7e1a71307f5d4f files/bash-3.2-loadables.patch 5355
 RMD160 4a219e7e354f9ae36b7141d04aa3326d19ce1ab9 files/bash-3.2-loadables.patch 5355
 SHA256 e081fe84f4d253c5192d260a3e1af76ff7ece45c1739b327f46884a158c70b1a files/bash-3.2-loadables.patch 5355
+AUX bash-3.2-parallel-build.patch 686 RMD160 8518c94958d66a58504cf05b0428c7b3b1229e27 SHA1 08b11ad8a021034593e5de8560a8930cdb0b47af SHA256 0ad808cff4f93abbdb07d9b4bdb7fcdb203fa391395e4d9d2180d6032b4bf06e
+MD5 12f1c9ea24bde9f448433b5128347aa2 files/bash-3.2-parallel-build.patch 686
+RMD160 8518c94958d66a58504cf05b0428c7b3b1229e27 files/bash-3.2-parallel-build.patch 686
+SHA256 0ad808cff4f93abbdb07d9b4bdb7fcdb203fa391395e4d9d2180d6032b4bf06e files/bash-3.2-parallel-build.patch 686
 AUX bash-3.2-process-subst.patch 291 RMD160 0d295ebd160fd80d5c07758f992bb0de8c45b6a0 SHA1 1d374cf3f5dac6de77d32db927658ff8943e32fc SHA256 4c04ea6b60f57d6bc6daf85c35d13e24dec5ebac8e1aaf68c0eeaa180e6d2d98
 MD5 6a6536e68777ced16c9e66c086842cc0 files/bash-3.2-process-subst.patch 291
 RMD160 0d295ebd160fd80d5c07758f992bb0de8c45b6a0 files/bash-3.2-process-subst.patch 291
@@ -308,22 +312,22 @@ EBUILD bash-3.1_p17.ebuild 4601 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e
 MD5 22830ce4e0c1e669719581d5e00cfb82 bash-3.1_p17.ebuild 4601
 RMD160 7d674942ae8ebcb662faa45a9efacb236bd6202e bash-3.1_p17.ebuild 4601
 SHA256 ff12913c0306b1b597fb7da13740af52c2ccd65125695914fcf84cac455681a8 bash-3.1_p17.ebuild 4601
-EBUILD bash-3.2_p17-r1.ebuild 5140 RMD160 fca5b73efe14b5a618acf86a504dde20a285f2da SHA1 3423748a5f5b928bb648d252df06a4d50882df07 SHA256 666d052077b500b0e8107d775a6d72ddae56b7c1403b2b0a20d218ab76a94172
-MD5 160c0a3dd776b323db3bf73b20782c9b bash-3.2_p17-r1.ebuild 5140
-RMD160 fca5b73efe14b5a618acf86a504dde20a285f2da bash-3.2_p17-r1.ebuild 5140
-SHA256 666d052077b500b0e8107d775a6d72ddae56b7c1403b2b0a20d218ab76a94172 bash-3.2_p17-r1.ebuild 5140
-EBUILD bash-3.2_p17.ebuild 4631 RMD160 e5f26a719a1369d18d02307b23cd70f48b8aeb5a SHA1 22cb37a3d453ee9ab52c34850d8c32187cab1108 SHA256 ef0abeea2ab93455d32a584f25618bd3e028442bfd7242cb9495dcde047a82fe
-MD5 2e82e8c1b7666091d6b91a359455d0a7 bash-3.2_p17.ebuild 4631
-RMD160 e5f26a719a1369d18d02307b23cd70f48b8aeb5a bash-3.2_p17.ebuild 4631
-SHA256 ef0abeea2ab93455d32a584f25618bd3e028442bfd7242cb9495dcde047a82fe bash-3.2_p17.ebuild 4631
-EBUILD bash-3.2_p25.ebuild 5137 RMD160 b39e6b9d1f61ea6e516a3cb9aae5fdeb78d5cce1 SHA1 ef1b49a2710bfada21b313ab75a83d9603a0305c SHA256 67aa9271d1f53a53aa128b68ea64079e48eb8bbdd9aec5f8ac3c2c16e76bfe9f
-MD5 c0c1e60b6849ee550081118a3adf5d25 bash-3.2_p25.ebuild 5137
-RMD160 b39e6b9d1f61ea6e516a3cb9aae5fdeb78d5cce1 bash-3.2_p25.ebuild 5137
-SHA256 67aa9271d1f53a53aa128b68ea64079e48eb8bbdd9aec5f8ac3c2c16e76bfe9f bash-3.2_p25.ebuild 5137
-MISC ChangeLog 26183 RMD160 fce5e491d8675b5ccf69114b61989c0a2b36e2b0 SHA1 8d599f7ff0f47a9a57ebc0019104e7c3e2ea2ba5 SHA256 a41e021bb131f4204360373838cb50da7953578d75931d132719595f15ec0e40
-MD5 26c31cd0cc5c1726f559d1fb18fd27d1 ChangeLog 26183
-RMD160 fce5e491d8675b5ccf69114b61989c0a2b36e2b0 ChangeLog 26183
-SHA256 a41e021bb131f4204360373838cb50da7953578d75931d132719595f15ec0e40 ChangeLog 26183
+EBUILD bash-3.2_p17-r1.ebuild 5202 RMD160 cad70c1bda9a7b2449adf2d97ad9e9584d05863c SHA1 d5833457ea9e664cfe7aa8f81d025748b2356d7c SHA256 134abf0475b89b240d746d4a0334764771a946c47044d13fc86391524a4f9da1
+MD5 daf0a2bfa6ec0d45981cb5e31915280d bash-3.2_p17-r1.ebuild 5202
+RMD160 cad70c1bda9a7b2449adf2d97ad9e9584d05863c bash-3.2_p17-r1.ebuild 5202
+SHA256 134abf0475b89b240d746d4a0334764771a946c47044d13fc86391524a4f9da1 bash-3.2_p17-r1.ebuild 5202
+EBUILD bash-3.2_p17.ebuild 4693 RMD160 13f9eebe9693c156dc3df0513788cd797992ac0c SHA1 f02bf2847768f52ba56cdceadeddd8ff0155f0b4 SHA256 2ed6ebbca4905c8a260256d28da83b85752952ad2a0e2cfcdbdfd1827e332476
+MD5 e50dd55338dbdc2ae0538a8c2d917ce1 bash-3.2_p17.ebuild 4693
+RMD160 13f9eebe9693c156dc3df0513788cd797992ac0c bash-3.2_p17.ebuild 4693
+SHA256 2ed6ebbca4905c8a260256d28da83b85752952ad2a0e2cfcdbdfd1827e332476 bash-3.2_p17.ebuild 4693
+EBUILD bash-3.2_p25.ebuild 5199 RMD160 2135f962ffaf752a0ab5cea8d5ca0932b829a946 SHA1 b8e42697d3d7230e5c714c44a077895143090a02 SHA256 003da17e893b540c492513e9783f12e0e87ded6af9c5ba1151127940e153909f
+MD5 b2f318f3ea6807581a9603853cd27a78 bash-3.2_p25.ebuild 5199
+RMD160 2135f962ffaf752a0ab5cea8d5ca0932b829a946 bash-3.2_p25.ebuild 5199
+SHA256 003da17e893b540c492513e9783f12e0e87ded6af9c5ba1151127940e153909f bash-3.2_p25.ebuild 5199
+MISC ChangeLog 26378 RMD160 739ae4f337ebb33d07a2fe1f45050cfca07bbb00 SHA1 478b76bb1d26fcd3b43a02fc5aeb7166a52cffa5 SHA256 e41bbd076932df1512af3343cd4dadc0c4564dcfa9708e677cf7b7ff742cd174
+MD5 cc6841e8567d8d55b01a26e1b970921b ChangeLog 26378
+RMD160 739ae4f337ebb33d07a2fe1f45050cfca07bbb00 ChangeLog 26378
+SHA256 e41bbd076932df1512af3343cd4dadc0c4564dcfa9708e677cf7b7ff742cd174 ChangeLog 26378
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -353,9 +357,9 @@ MD5 f292d80f81b0e8ef47e990924aeb949e files/digest-bash-3.2_p25 5354
 RMD160 78ac27a5ac6c2c24d8aa549ee32528e3755874ab files/digest-bash-3.2_p25 5354
 SHA256 d36d2b0efeed1cfcee9343ff6c099a4ffc50942687890d3d27057ead3320a46e files/digest-bash-3.2_p25 5354
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGz1fYp/wUKkr7RBoRArC8AKCdDFAaRkALBIkRXyMQCvIaKfO9JQCfbnec
-Mzg4QZxeYs4GCp44lB4g1jE=
-=T6TJ
+iD8DBQFHJOGbp/wUKkr7RBoRAgtYAKDNZ9QZTGQiv3DzXWBBEfcfCmu9gQCeOENv
+UmfyDzWYQlmc0JcKaAFNSSM=
+=j3uk
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash/bash-3.2_p17-r1.ebuild b/app-shells/bash/bash-3.2_p17-r1.ebuild
index 4917a0582dc5..08ddaffc3ad2 100644
--- a/app-shells/bash/bash-3.2_p17-r1.ebuild
+++ b/app-shells/bash/bash-3.2_p17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p17-r1.ebuild,v 1.1 2007/08/07 06:10:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p17-r1.ebuild,v 1.2 2007/10/28 19:23:00 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -64,6 +64,7 @@ src_unpack() {
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
 		epatch "${FILESDIR}"/${PN}-3.2-loadables.patch
+		epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
 
 		# Fix process substitution on BSD.
 		epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
diff --git a/app-shells/bash/bash-3.2_p17.ebuild b/app-shells/bash/bash-3.2_p17.ebuild
index 9aa7c04e0ec1..66ba96295e2d 100644
--- a/app-shells/bash/bash-3.2_p17.ebuild
+++ b/app-shells/bash/bash-3.2_p17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p17.ebuild,v 1.8 2007/08/07 03:55:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p17.ebuild,v 1.9 2007/10/28 19:23:00 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -56,6 +56,7 @@ src_unpack() {
 
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
+		epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
 
 		# Fix process substitution on BSD.
 		epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
diff --git a/app-shells/bash/bash-3.2_p25.ebuild b/app-shells/bash/bash-3.2_p25.ebuild
index 3cec03a4f288..2fb5a13c8cd8 100644
--- a/app-shells/bash/bash-3.2_p25.ebuild
+++ b/app-shells/bash/bash-3.2_p25.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p25.ebuild,v 1.1 2007/08/24 22:11:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p25.ebuild,v 1.2 2007/10/28 19:23:00 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -64,6 +64,7 @@ src_unpack() {
 	if ! use vanilla ; then
 		epatch "${FILESDIR}"/${PN}-3.1-gentoo.patch
 		epatch "${FILESDIR}"/${PN}-3.2-loadables.patch
+		epatch "${FILESDIR}"/${PN}-3.2-parallel-build.patch #189671
 
 		# Fix process substitution on BSD.
 		epatch "${FILESDIR}"/${PN}-3.2-process-subst.patch
diff --git a/app-shells/bash/files/bash-3.2-parallel-build.patch b/app-shells/bash/files/bash-3.2-parallel-build.patch
new file mode 100644
index 000000000000..0ee049106297
--- /dev/null
+++ b/app-shells/bash/files/bash-3.2-parallel-build.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/189671
+http://lists.gnu.org/archive/html/bug-bash/2007-08/msg00081.html
+
+--- bash-3.2/Makefile.in
++++ bash-3.2/Makefile.in
+@@ -584,7 +584,9 @@
+ 	@( { test "${RL_LIBDIR}" = "${libdir}" && exit 0; } || \
+ 		cd ${RL_LIBDIR} && $(MAKE) $(MFLAGS) libreadline.a) || exit 1
+ 
+-$(HISTORY_LIBRARY): config.h $(HISTORY_SOURCE)
++# prevent parallel build race conditions in the lib/readline/ subdir
++# by depending on libreadline.a when applicable
++$(HISTORY_LIBRARY): config.h $(HISTORY_SOURCE) $(READLINE_DEP)
+ 	@echo making $@ in ${HIST_LIBDIR}
+ 	@( { test "${HIST_LIBDIR}" = "${libdir}" && exit 0; } || \
+ 		cd ${HIST_LIBDIR} && $(MAKE) $(MFLAGS) libhistory.a) || exit 1