diff options
| author |   Stephen Bennett <spb@gentoo.org> | 2006-09-06 22:25:24 +0000 |
|---|---|---|
| committer | Stephen Bennett <spb@gentoo.org> | 2006-09-06 22:25:24 +0000 |
| commit | d2af1f3ec75fa0c1391de3b4665acdc85393dd95 (patch) | |
| tree | 0ad5208ccd04e08020bc4261900eede27bea5062 /dev-libs/libpcre | |
| parent | Initial import. Original ebuild by Paul Bredbury <brebs@sent.com>. Edited b... (diff) | |
| download | gentoo-2-d2af1f3ec75fa0c1391de3b4665acdc85393dd95.tar.gz gentoo-2-d2af1f3ec75fa0c1391de3b4665acdc85393dd95.tar.bz2 gentoo-2-d2af1f3ec75fa0c1391de3b4665acdc85393dd95.zip | |
Fix parallel build. Bug #130668.
(Portage version: 2.1.1_rc1-r4)
Diffstat (limited to 'dev-libs/libpcre')
| -rw-r--r-- | dev-libs/libpcre/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/libpcre/files/pcre-6.6-parallel-build.patch | 27 | ||||
| -rw-r--r-- | dev-libs/libpcre/libpcre-6.6.ebuild | 5 |
3 files changed, 36 insertions, 2 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/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" |