Fix parallel build

Package-Manager: portage-2.0.51.22-r1

4 files changed, 56 insertions, 10 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index b3ccc53d20c2..8ef5be04aebf 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.47 2005/06/09 02:46:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.48 2005/06/27 22:15:27 agriffis Exp $
+
+  27 Jun 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/readline-5.0-parallel.patch, readline-5.0-r2.ebuild:
+  Fix parallel build
 
   09 Jun 2005; Mike Frysinger <vapier@gentoo.org> readline-5.0-r2.ebuild:
   Stabilize for all arches.
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 648d4c22c04f..c71be0bba483 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,14 +1,25 @@
-MD5 7934ae052619d6bca781f2712973c563 ChangeLog 6985
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6cd733ddd626b706dc68491cab9bb838 readline-4.3-r6.ebuild 3091
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 fd9cf38abf55098308810320f04c2cf4 readline-5.0-r2.ebuild 2588
+MD5 e445742c1d02e2d51f743779c6f0fe2f ChangeLog 7121
+MD5 f33dcb1ac4224298c1d0bf665cf9842a readline-5.0-r2.ebuild 2667
 MD5 516ee3121f8b89b2de35d72e02bc9a3b readline-4.3-r5.ebuild 2762
-MD5 6cd733ddd626b706dc68491cab9bb838 readline-4.3-r6.ebuild 3091
+MD5 b6bf5c9721fc8c623377b40768d18dae files/readline-5.0-del-backspace-policy.patch 1475
 MD5 e3ee94eed45baf4ca76736da56d72bad files/digest-readline-5.0-r2 350
-MD5 a0bad5c8ba91f5c50ea6c2c97a76f2d1 files/readline-5.0-self-insert.patch 2463
-MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
-MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
-MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
+MD5 cd1beb3627cb585cac6adcb530a01823 files/readline-5.0-parallel.patch 849
 MD5 4a3ebcb995491c2730d156b314cbab0b files/bash-3.0-etc-inputrc.patch 1223
+MD5 a0bad5c8ba91f5c50ea6c2c97a76f2d1 files/readline-5.0-self-insert.patch 2463
 MD5 fe45d673627dab53fb3fcffcb4f55e4e files/readline-5.0-solaris.patch 756
+MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
 MD5 d5f28667389d9681136307274ebc1f28 files/readline-5.0-no_rpath.patch 363
-MD5 b6bf5c9721fc8c623377b40768d18dae files/readline-5.0-del-backspace-policy.patch 1475
+MD5 9905e333ead392447a670e0f2374651a files/macos.patch 504
+MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCwHqRBXaUFmZvwyMRAmzuAJ9YDTPK3cSOtd2YFI8nrgMouXRB2wCePqOA
+n3WqKShtXzzspRB9XcdmOQA=
+=CQ2S
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-5.0-parallel.patch b/sys-libs/readline/files/readline-5.0-parallel.patch
new file mode 100644
index 000000000000..eccb903f0f85
--- /dev/null
+++ b/sys-libs/readline/files/readline-5.0-parallel.patch
@@ -0,0 +1,28 @@
+--- readline-5.0/shlib/Makefile.in.old	2003-12-10 12:02:47 -0500
++++ readline-5.0/shlib/Makefile.in	2005-06-27 18:06:02 -0400
+@@ -145,7 +145,10 @@
+ 
+ all: $(SHLIB_STATUS)
+ 
+-supported: $(SHARED_LIBS)
++# Since the libs share some objects, make sure they're built separately
++# and not in parallel
++supported:
++	set -e; for x in $(SHARED_LIBS); do $(MAKE) $$x; done
+ 
+ unsupported:
+ 	@echo "Your system and compiler (${host_os}-${CC}) are not supported by the"
+--- readline-5.0/Makefile.in.old	2004-04-22 16:44:37 -0400
++++ readline-5.0/Makefile.in	2005-06-27 18:05:29 -0400
+@@ -145,7 +145,10 @@
+ 
+ everything: all examples
+ 
+-static: $(STATIC_LIBS)
++# Since the libs share some objects, make sure they're built separately
++# and not in parallel
++static:
++	set -e; for x in $(STATIC_LIBS); do $(MAKE) $$x; done
+ 
+ libreadline.a: $(OBJECTS)
+ 	$(RM) $@
diff --git a/sys-libs/readline/readline-5.0-r2.ebuild b/sys-libs/readline/readline-5.0-r2.ebuild
index 585400582a50..e23f10d19e6a 100644
--- a/sys-libs/readline/readline-5.0-r2.ebuild
+++ b/sys-libs/readline/readline-5.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r2.ebuild,v 1.3 2005/06/09 02:46:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.0-r2.ebuild,v 1.4 2005/06/27 22:15:27 agriffis Exp $
 
 inherit eutils gnuconfig
 
@@ -38,6 +38,9 @@ src_unpack() {
 
 	# force ncurses linking #71420
 	sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
+
+	# fix building in parallel
+	epatch ${FILESDIR}/readline-5.0-parallel.patch
 }
 
 src_compile() {