Fix parallel build. Bug #130668.

Package-Manager: portage-2.1.1_rc1-r4

4 files changed, 48 insertions, 10 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 1ffd07b52a0e..3b5544046c89 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.74 2006/06/22 17:11:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.75 2006/09/06 22:25:24 spb Exp $
+
+  06 Sep 2006; Stephen Bennett <spb@gentoo.org>
+  +files/pcre-6.6-parallel-build.patch, libpcre-6.6.ebuild:
+  Fix parallel build. Bug #130668.
 
   22 Jun 2006; Fabian Groffen <grobian@gentoo.org> libpcre-6.6.ebuild:
   Readded ~ppc-macos since this version compiles and works again
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index c0683bce0169..3fd290734885 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -30,6 +30,10 @@ AUX pcre-6.4-link.patch 924 RMD160 1ddb38d24ee8561733ad8641bc451e4ed7f24e4e SHA1
 MD5 f1cc98005a66bddd1311ea17034eb29c files/pcre-6.4-link.patch 924
 RMD160 1ddb38d24ee8561733ad8641bc451e4ed7f24e4e files/pcre-6.4-link.patch 924
 SHA256 04fd5242be6e4bee580f67f9da48e91635891b1c09792fce0bde1fc670044752 files/pcre-6.4-link.patch 924
+AUX pcre-6.6-parallel-build.patch 1150 RMD160 14713f33c3251334cfffd4578ff03a7763257112 SHA1 42bd250f51cfa576a8f41a7581701890ab9d7781 SHA256 a7a15a750f29632e9e412c2dde45c0186c27bf8c8580b2e111379ee64d15ba95
+MD5 2624830d0a69103fdc7f95d2fd5596e6 files/pcre-6.6-parallel-build.patch 1150
+RMD160 14713f33c3251334cfffd4578ff03a7763257112 files/pcre-6.6-parallel-build.patch 1150
+SHA256 a7a15a750f29632e9e412c2dde45c0186c27bf8c8580b2e111379ee64d15ba95 files/pcre-6.6-parallel-build.patch 1150
 DIST pcre-4.2.tar.bz2 335068
 DIST pcre-4.4.tar.bz2 341388
 DIST pcre-4.5.tar.bz2 349536
@@ -66,14 +70,14 @@ EBUILD libpcre-6.4.ebuild 1361 RMD160 daa7472a67ee12affa3f836a30ab49f443214e55 S
 MD5 47c8a6e828dc3af7dd08de68d43bf85c libpcre-6.4.ebuild 1361
 RMD160 daa7472a67ee12affa3f836a30ab49f443214e55 libpcre-6.4.ebuild 1361
 SHA256 39088b666ec9b4397dd47c677cca4aa4bd5d9855cec3b89e181be72ea46217da libpcre-6.4.ebuild 1361
-EBUILD libpcre-6.6.ebuild 1382 RMD160 c69cd3e62c698a94a30fb1cf2f790102d0d16c5d SHA1 00584fe418d30b688788c0ec2c3710733f8a727e SHA256 e4361f40481d18ee2f0b4343481b9d4712b2d48017b686625ce0fb6783480a29
-MD5 ba9b4cafc364624cb03050816410638f libpcre-6.6.ebuild 1382
-RMD160 c69cd3e62c698a94a30fb1cf2f790102d0d16c5d libpcre-6.6.ebuild 1382
-SHA256 e4361f40481d18ee2f0b4343481b9d4712b2d48017b686625ce0fb6783480a29 libpcre-6.6.ebuild 1382
-MISC ChangeLog 9157 RMD160 3720f312481892f71260fe5e2ed61c70a9215266 SHA1 9b6e6737e54ad34426499221ab4896dfbf2b43c7 SHA256 e39e49d483c8d51dc01c3751739cdd2845b5d2c4987ace1b45780d98e6e059a7
-MD5 86c0fdcc671b41183c0b0f5cb0cab932 ChangeLog 9157
-RMD160 3720f312481892f71260fe5e2ed61c70a9215266 ChangeLog 9157
-SHA256 e39e49d483c8d51dc01c3751739cdd2845b5d2c4987ace1b45780d98e6e059a7 ChangeLog 9157
+EBUILD libpcre-6.6.ebuild 1479 RMD160 c1772f126dbaefd04370358e846b766cccdcd013 SHA1 64a76157c868dd18129c8e56b17f52d4bf5ad239 SHA256 eaa5465c03d1205da01e9010b6f14ef23d980bd5e18e8a78ece3be7c5338d504
+MD5 f66f63e80a51badc4bfe45bb87baecf0 libpcre-6.6.ebuild 1479
+RMD160 c1772f126dbaefd04370358e846b766cccdcd013 libpcre-6.6.ebuild 1479
+SHA256 eaa5465c03d1205da01e9010b6f14ef23d980bd5e18e8a78ece3be7c5338d504 libpcre-6.6.ebuild 1479
+MISC ChangeLog 9297 RMD160 0a1116e6a220b244df488f1ec94fb2b3783d0880 SHA1 5b56ceacdfab69cc7addd359b03b1f52380418b2 SHA256 d5e98593c2333200bb2aa43db53e17209f7636cd42555bffbbd4deff9b2df0b3
+MD5 7e4acffd9b14dda59e03717e92d0833d ChangeLog 9297
+RMD160 0a1116e6a220b244df488f1ec94fb2b3783d0880 ChangeLog 9297
+SHA256 d5e98593c2333200bb2aa43db53e17209f7636cd42555bffbbd4deff9b2df0b3 ChangeLog 9297
 MISC metadata.xml 221 RMD160 c08d57bf5bb9110d90f3d4bae07a87b662add92a SHA1 083b4c4186b97766a77a282179eb387403ffbd71 SHA256 2effb4fe4513bd8d65e088ec41cd470c52003e4b66feb7cf7a5247aaa894345f
 MD5 d6863e368bff32cb8dca1b8062fbc321 metadata.xml 221
 RMD160 c08d57bf5bb9110d90f3d4bae07a87b662add92a metadata.xml 221
diff --git a/dev-libs/libpcre/files/pcre-6.6-parallel-build.patch b/dev-libs/libpcre/files/pcre-6.6-parallel-build.patch
new file mode 100644
index 000000000000..b4a4387d4485
--- /dev/null
+++ b/dev-libs/libpcre/files/pcre-6.6-parallel-build.patch
@@ -0,0 +1,27 @@
+diff -ur pcre-6.6.orig/Makefile.in pcre-6.6/Makefile.in
+--- pcre-6.6.orig/Makefile.in	2006-09-06 22:26:24.000000000 +0100
++++ pcre-6.6/Makefile.in	2006-09-06 22:52:13.000000000 +0100
+@@ -188,20 +188,20 @@
+ 		pcretest.@OBJEXT@ \
+ 		libpcre.la @POSIX_LIB@
+ 
+-pcrecpp_unittest@EXEEXT@: libpcrecpp.la pcrecpp_unittest.@OBJEXT@ \
++pcrecpp_unittest@EXEEXT@: libpcrecpp.la @POSIX_LIB@ pcrecpp_unittest.@OBJEXT@ \
+ 		@ON_WINDOWS@ winshared
+ 		$(CXXLINK) $(PURIFY) $(EFENCE) -o pcrecpp_unittest@EXEEXT@ \
+ 		pcrecpp_unittest.@OBJEXT@ \
+ 		libpcrecpp.la @POSIX_LIB@
+ 
+-pcre_scanner_unittest@EXEEXT@: libpcrecpp.la pcre_scanner_unittest.@OBJEXT@ \
++pcre_scanner_unittest@EXEEXT@: libpcrecpp.la @POSIX_LIB@ pcre_scanner_unittest.@OBJEXT@ \
+ 		@ON_WINDOWS@ winshared
+ 		$(CXXLINK) $(PURIFY) $(EFENCE) \
+ 		-o pcre_scanner_unittest@EXEEXT@ \
+ 		pcre_scanner_unittest.@OBJEXT@ \
+ 		libpcrecpp.la @POSIX_LIB@
+ 
+-pcre_stringpiece_unittest@EXEEXT@: libpcrecpp.la \
++pcre_stringpiece_unittest@EXEEXT@: libpcrecpp.la @POSIX_LIB@ \
+ 		pcre_stringpiece_unittest.@OBJEXT@ @ON_WINDOWS@ winshared
+ 		$(CXXLINK) $(PURIFY) $(EFENCE) \
+ 		-o pcre_stringpiece_unittest@EXEEXT@ \
diff --git a/dev-libs/libpcre/libpcre-6.6.ebuild b/dev-libs/libpcre/libpcre-6.6.ebuild
index 6c1cce25002e..e81b6a971c75 100644
--- a/dev-libs/libpcre/libpcre-6.6.ebuild
+++ b/dev-libs/libpcre/libpcre-6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-6.6.ebuild,v 1.4 2006/06/22 17:11:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-6.6.ebuild,v 1.5 2006/09/06 22:25:24 spb Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -23,6 +23,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/pcre-6.3-uclibc-tuple.patch
 	epatch "${FILESDIR}"/pcre-6.4-link.patch
 
+	# Added for bug #130668 -- fix parallel builds
+	epatch "${FILESDIR}"/pcre-6.6-parallel-build.patch
+
 	# TODO: Fix this.  Use -fPIC just for the shared objects.
 	# position-independent code must used for all shared objects.
 	ewarn "TODO: Fix this bad -fPIC handling"