[openjdk-8] 03/05: Replaced the --with-parallel-jobs argument with --with-num-cores for parallel building

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit c0cabaaffa92527e46c8463f07be76769d4dcb18
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Mar 30 15:42:22 2014 +0200

    Replaced the --with-parallel-jobs argument with --with-num-cores for parallel building
---
 debian/rules | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index eddc534..927d33d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,20 +89,12 @@ security	= $(etcdir)/security
 jreimg		= openjdk.build/j2re-image
 sdkimg		= openjdk.build/j2sdk-image
 
-# Support parallel=<n> in DEB_BUILD_OPTIONS (see #209008)
 COMMA=,
 SPACE = $(EMPTY) $(EMPTY)
-ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
-  NJOBS = $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
-  HOTSPOT_BUILD_JOBS = $(NJOBS)
-  ALT_PARALLEL_COMPILE_JOBS = $(NJOBS)
-  export HOTSPOT_BUILD_JOBS
-  export ALT_PARALLEL_COMPILE_JOBS
-endif
 
-# make the build log comparable
-#export HOTSPOT_BUILD_JOBS = 1
-#export ALT_PARALLEL_COMPILE_JOBS = 1
+# Number of processors for parallel building (set to 1 to make the build log comparable)
+NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :`
+NUM_PROC=${NUM_PROC:-1}
 
 # Extracting debug symbols done by dh_strip
 export ALT_OBJCOPY=fake
@@ -562,9 +554,7 @@ else
   CONFIGURE_ARGS += --disable-docs
 endif
 
-ifneq (,$(NJOBS))
-  CONFIGURE_ARGS += --with-parallel-jobs=$(NJOBS)
-endif
+CONFIGURE_ARGS += --with-num-cores=$(NUM_PROC)
 
 ifeq ($(with_pulse),yes)
   CONFIGURE_ARGS += --enable-pulse-java

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git