[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-4-40-g7bac23c

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-3.5 branch:
commit 1204d123135a92028a39b3992afdc4dbd3515e7c
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Oct 20 22:58:09 2011 +0200

    configure now handles parallelism itself

diff --git a/rules b/rules
index 94b1ccc..e8c93e7 100755
--- a/rules
+++ b/rules
@@ -1220,34 +1220,16 @@ endif
 
 ## Build n projects in parallel?
 ## DEB_BUILD_OPTIONS=parallel=<n>
+## if not specified LibreOffices configure tries to find it out itself
 NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n 's/^\(.* \)\?parallel=\([0-9]\+\).*$$/\2/p')
 AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
-ifeq "$(NUM_CPUS)" ""
-	NUM_CPUS := 1
-  ifeq "$(PARALLEL_BUILD)" "y"
-	# according to Pavel Janik, build -P<number of cores> -- -P2
-	# is ideal. This sets the first -P according to the number
-	# of CPUs (where dual-core CPUS report 2, too)
-    ifneq ($(AVAIL_CPUS),1)
-	NUM_CPUS := $(shell expr $(AVAIL_CPUS))
-    endif
+ifeq "$(PARALLEL_BUILD)" "y"
 	# http://bugs.debian.org/622644
 	BUILD_DEPS += , make (>= 3.82)
-  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
+  ifneq "$(NUM_CPUS)" "$(AVAIL_CPUS)"
+	CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
   endif
 endif
-# disabled for now. needs fixed GNU make (#622644)
-#	CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
-	# breaks. At least with 2
-#	CONFIGURE_FLAGS += --with-max-jobs=$(NUM_CPUS)
 
 CURDIR ?= $(shell pwd)
 

-- 
LibreOffice packaging repository