summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2010-10-11 15:18:26 +0000
committerJory Pratt <anarchy@gentoo.org>2010-10-11 15:18:26 +0000
commite5f69d360eee019a0ee726ddee21f06b7bc1cd8c (patch)
tree549e63709594dcea720d1476cec4a7e4b5c1d65a /dev-libs/nspr/files
parenttidy (diff)
downloadhistorical-e5f69d360eee019a0ee726ddee21f06b7bc1cd8c.tar.gz
historical-e5f69d360eee019a0ee726ddee21f06b7bc1cd8c.tar.bz2
historical-e5f69d360eee019a0ee726ddee21f06b7bc1cd8c.zip
Ensure we can build in parallel
Package-Manager: portage-2.1.9.14/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/nspr/files')
-rw-r--r--dev-libs/nspr/files/nspr-4.8-parallel-fixup.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/dev-libs/nspr/files/nspr-4.8-parallel-fixup.patch b/dev-libs/nspr/files/nspr-4.8-parallel-fixup.patch
new file mode 100644
index 000000000000..6564af9cbf38
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.8-parallel-fixup.patch
@@ -0,0 +1,46 @@
+--- a/mozilla/nsprpub/Makefile.in
++++ b/mozilla/nsprpub/Makefile.in
+@@ -40,18 +40,16 @@
+
+ MOD_DEPTH = .
+ topsrcdir = @top_srcdir@
+ srcdir = @srcdir@
+ VPATH = @srcdir@
+
+ include $(MOD_DEPTH)/config/autoconf.mk
+
+-MAKE := $(patsubst -j%,,$(MAKE)) -j1
+-
+ DIRS = config pr lib
+
+ ifdef MOZILLA_CLIENT
+ # Make nsinstall use absolute symlinks by default for Mozilla OSX builds
+ # http://bugzilla.mozilla.org/show_bug.cgi?id=193164
+ ifeq ($(OS_ARCH),Darwin)
+ ifndef NSDISTMODE
+ NSDISTMODE=absolute_symlink
+--- a/mozilla/nsprpub/pr/src/Makefile.in
++++ b/mozilla/nsprpub/pr/src/Makefile.in
+@@ -384,17 +384,20 @@ endif
+ #
+
+
+ #
+ # The Client build wants the shared libraries in $(dist_bindir)
+ # so we also install them there.
+ #
+
+-export:: $(TARGETS)
++export::
++ $(MAKE) -C . build
++
++build:: $(TARGETS)
+ $(INSTALL) -m 444 $(TARGETS) $(dist_libdir)
+ ifdef SHARED_LIBRARY
+ ifeq ($(OS_ARCH),HP-UX)
+ $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_libdir)
+ $(INSTALL) -m 755 $(SHARED_LIBRARY) $(dist_bindir)
+ else
+ $(INSTALL) -m 444 $(SHARED_LIBRARY) $(dist_bindir)
+ endif
+