Fix parallel build issues with pathnames.h in lib/sh/ #284633 by Justin Lecher.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

3 files changed, 35 insertions, 3 deletions

diff --git a/app-shells/bash/ChangeLog b/app-shells/bash/ChangeLog
index c0c8b9f88c86..1f1020c17743 100644
--- a/app-shells/bash/ChangeLog
+++ b/app-shells/bash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/bash
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.231 2009/10/10 14:57:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.232 2009/10/15 17:48:15 vapier Exp $
+
+  15 Oct 2009; Mike Frysinger <vapier@gentoo.org>
+  files/bash-4.0-parallel-build.patch:
+  Fix parallel build issues with pathnames.h in lib/sh/ #284633 by Justin
+  Lecher.
 
   10 Oct 2009; Raúl Porcel <armin76@gentoo.org> bash-4.0_p28.ebuild:
   m68k stable wrt #270008
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 3291f8e3caef..ce506ef31cad 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX autoconf-mktime-2.59.patch 4686 RMD160 64f719df39ae0a17999cb6b87ce9c5e275fcd7eb SHA1 4355b22b415c703c8ca9cc1b7b89ec44edc7ad4c SHA256 3c16de6cbe24fc806c29390eaf4c7e1d9ceda3df523bb18941cf0a3184356bba
 AUX bash-3.0-configs.patch 2538 RMD160 00e8015531efb6a59298782581928f1aff2247e6 SHA1 7f4615de4ac2219372d34dfbead3311fcfdfab2a SHA256 09d11c8e6158b2346fc39830d75af2210cd1cec7c8e9965aed96b66213310d3f
 AUX bash-3.0-etc-inputrc.patch 1443 RMD160 8bf34837bef20bfc7062e32e4a23aa6af9ef2b49 SHA1 a58b9011f61e7e60be0fcd8741d91292222eff61 SHA256 b43736c32ed9d9088ee1cbbff11b78d6f6993492f9da3e1eb5151a64a082d025
@@ -19,7 +22,7 @@ AUX bash-3.2-session-leader.patch 2098 RMD160 b298743fb54162d0caa8d409bf1f7b6f79
 AUX bash-3.2-ulimit.patch 449 RMD160 db5277031105cd4d2b7a6b92a8e74e532eb6f3db SHA1 cc634a2c188ac7661b9f4843f1b98f59d8f311a6 SHA256 d40709360f25ab355dc83e334b512d3dd80e435e241d1e69581fbc41504f8381
 AUX bash-4.0-ldflags-for-build.patch 512 RMD160 cebd92af1de1a97838248bbd5db0d6267ba826b9 SHA1 8967f82ba01bcb4913f914672d456f1d4b3682d6 SHA256 97b0ee283846e6530a0f025b1fe69054229a37b00180b82fcd44dc0c3381dc8a
 AUX bash-4.0-negative-return.patch 748 RMD160 ba602c6fb3caa055a09a72122c45e160ea51e323 SHA1 8fe1b27ad67e3e3b098b7ddeb6ded35594a9b106 SHA256 771f89825fc81ff035f1b03dfe1e65b7e58a0039c005067b0c37414b84ddbf2b
-AUX bash-4.0-parallel-build.patch 874 RMD160 0a33dd9d60b0e1b5a4fbf89f8de1934c0e8e6ecb SHA1 b5c678c4d7b33ce4d1ea126350d859dfe060d8e2 SHA256 cab2cbe41768a2a4e6c34d0b00bd92ec4e598c049e3d8ee6080b27f77ce14284
+AUX bash-4.0-parallel-build.patch 1359 RMD160 bb5e42fb53f4153794e5c2407590dccaf3893697 SHA1 f12a6b24f68d58750ea4e7a7d52cb88a7d30b663 SHA256 abdf1e078dfb2cd291addd25e7962d0d2ed4087cbe3d9dabc2fdce194cc17ec4
 AUX bash_logout 205 RMD160 fa6064b67bd02cf66dc490759442a0127770d420 SHA1 a6983665cc842bde96fbc8811be89cf8fda71a45 SHA256 15aaded954389c05d7de5d36c4887db61975ad52c87ad78baf1062ec8997289d
 AUX bashrc 2796 RMD160 7d88ed1dbe1f88c8752b2301376f4702fc178375 SHA1 783fcfd8c3273184db638f5e61da1d0921426d00 SHA256 de72a331ed65585fd70353d0d36d5d69e229b7db52c7cb97aeefd8f1b148d218
 AUX dot-bash_logout 127 RMD160 6092e24ba79924d0dd566657f97972237f8f5b68 SHA1 9e1e6e03b033fdfcf9f2098324bac5754c26ec69 SHA256 3bcb4958dad662fc2cbe77177236679f7a09b8bdb0be738102df4457394f4022
@@ -133,5 +136,12 @@ EBUILD bash-3.2_p48-r1.ebuild 6151 RMD160 3c9454c27c6dc1770ef1acf5d3a6052218b6e1
 EBUILD bash-3.2_p48.ebuild 5988 RMD160 1189a2e142ef38b30b20960cccc3a997b76c3f71 SHA1 1f626a8e00abb29359ac07f7251977fedbca54b7 SHA256 7eb6f2828f2cb157d759333983d2f9a3616d2288cbbc9228a88472c278088882
 EBUILD bash-4.0_p28.ebuild 5650 RMD160 0f55e92e5d46c021890e5db07cacc8205657a0df SHA1 d41a8bc45ad133c4f4107b6e5cb5394660ef3541 SHA256 2453c1bd5f3ae77eed2c461104bec604da291d58e91c321899339f61c2cb8bd0
 EBUILD bash-4.0_p33.ebuild 5794 RMD160 6f1c342e92a726297b0307491bb94e3c2edeee39 SHA1 097a79c6d8770fc814c293fb76a65fefb0ae390f SHA256 a597aea23bc6799afde9fed119a839ed2bf49814da00f710a851648f1db68896
-MISC ChangeLog 37118 RMD160 2d5a2ad19cffc81a990773c241d4709dfae34832 SHA1 09c39fe75abe69220eda26d5cfa950c1f94fd2f1 SHA256 955786d0871e1bb13f5a623d49fb6b2d8d470012e7928c14cf7ad55ba0e28a3f
+MISC ChangeLog 37291 RMD160 3713d2e2acbf82645a22711806080aa52a1e49bc SHA1 7ecece392f088a970af84f87e740c17d37d561a9 SHA256 1276fcd4e4448c862cad3e5e0eea81bc924fdd0895955b0254d73b6ad1378282
 MISC metadata.xml 568 RMD160 c778ff1669af3c368238bcf481b344b741f0d6e1 SHA1 8d74d1c518351ad8085c9c26a5f2554d8c768b20 SHA256 48d380acb97dda0a7f4bd918b208d11367a8367d289b0a2d78ef08ef9a4e2562
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrXYGUACgkQlPl3HsVfCDopbACeJAEFA4cfPsKqBYCohtPE5f2b
+KDgAniod6npSwP/FTuydCsxaxB9AkOUk
+=AzB8
+-----END PGP SIGNATURE-----
diff --git a/app-shells/bash/files/bash-4.0-parallel-build.patch b/app-shells/bash/files/bash-4.0-parallel-build.patch
index aed92c644429..79e04c8cc295 100644
--- a/app-shells/bash/files/bash-4.0-parallel-build.patch
+++ b/app-shells/bash/files/bash-4.0-parallel-build.patch
@@ -18,3 +18,20 @@ patch by Peter Alfredsen
  test.o: general.h xmalloc.h bashtypes.h variables.h arrayfunc.h conftypes.h array.h hashlib.h
  test.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  test.o: make_cmd.h subst.h sig.h pathnames.h externs.h test.h
+
+http://bugs.gentoo.org/284633
+
+and another ...
+
+--- bash-4.0/lib/sh/Makefile.in
++++ bash-4.0/lib/sh/Makefile.in
+@@ -136,6 +136,9 @@
+ ${BUILD_DIR}/version.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile
+ 	-( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} version.h )
+ 
++${BUILD_DIR}/pathnames.h: ${BUILD_DIR}/config.h ${BUILD_DIR}/Makefile Makefile
++	-( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} pathnames.h )
++
+ # rules for losing makes, like SunOS
+ casemod.o: casemod.c
+ clktck.o: clktck.c