The following commit has been merged in the master branch:
commit 3cc2829e85240dfa52cf8fc1b1fd93c70a92306e
Author: Rene Engelhard <[email protected]>
Date: Thu Apr 7 17:30:43 2011 +0200
restrict parallel=x to 2
diff --git a/changelog b/changelog
index 4ac589d..aa65424 100644
--- a/changelog
+++ b/changelog
@@ -7,12 +7,13 @@ libreoffice (1:3.3.2-3) UNRELEASED; urgency=low
- run dpkg -s gcj-jdk on openjdk-using archs only when we build -gcj,
as otherwise it's not installed on the buildds (and we end up with a
eventually "wrong" gcc).
+ - restrict parallel=x to 2, at least 6 breaks, and don't experiment :)
* debian/control.in:
- build-conflict against at3-dev-tools, it installs a moc-qt3 alternative
for moc, which might hose the KDE VCLplug build - and configure insists
on ../bin/moc relative to libQt.so (thus /usr/bin/moc) now
- -- Rene Engelhard <[email protected]> Thu, 07 Apr 2011 15:56:12 +0200
+ -- Rene Engelhard <[email protected]> Thu, 07 Apr 2011 17:28:59 +0200
libreoffice (1:3.3.2-2) unstable; urgency=medium
diff --git a/rules b/rules
index be5a0e4..c27d31f 100755
--- a/rules
+++ b/rules
@@ -1109,6 +1109,14 @@ ifeq "$(NUM_CPUS)" ""
NUM_CPUS := $(shell expr $(AVAIL_CPUS))
endif
endif
+else
+ ifneq "$(PARALLEL_BUILD)" "y"
+ # no more than 2, please. At least 6 seems to fail.
+ ifneq ($(NUM_CPUS),1)
+ ifneq ($(NUM_CPUS),2)
+ NUM_CPUS := 2
+ endif
+ endif
endif
CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
# breaks. At least with 2
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
