[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-102-g1031120
The following commit has been merged in the debian-experimental-3.7 branch:
commit 103112032dbee8f49e2291d327445337684c52db
Author: Rene Engelhard <rene@debian.org>
Date: Wed Oct 31 22:45:36 2012 +0100
use --without-parallelism instead of --with-parallelism=1 and add clarifying comment
diff --git a/rules b/rules
index 37319c6..3bf397b 100755
--- a/rules
+++ b/rules
@@ -1211,11 +1211,13 @@ AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifeq "$(PARALLEL_BUILD)" "y"
# http://bugs.debian.org/622644
BUILD_DEPS += , make (>= 3.81-8.2)
+ # we need to specify it only if it differs, otherwise configure autodetects
+ # it.
ifneq "$(NUM_CPUS)" "$(AVAIL_CPUS)"
CONFIGURE_FLAGS += --with-parallelism=$(NUM_CPUS)
endif
else
- CONFIGURE_FLAGS += --with-parallelism=1
+ CONFIGURE_FLAGS += --without-parallelism
endif
--
LibreOffice packaging repository
Reply to: