[openjdk-8] 03/03: Restore parallel=<n> support in DEB_BUILD_OPTIONS

[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 3799eeca3a2058f87d2ae1bed6f62d6ab3d6fa00
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Apr 3 13:12:48 2014 +0200

    Restore parallel=<n> support in DEB_BUILD_OPTIONS
---
 debian/README.source |  1 +
 debian/rules         | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 50daf8b..09a9f78 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -39,6 +39,7 @@ contain several flags to change how a package is compiled and built.
   * nostrip:     debugging symbols should not be stripped from the
                  binary during installation
   * parallel=X:  package should be built using up to X parallel processes
+                 (capped to the number of cores)
   * nobootstrap: don't use gcj to bootstrap OpenJDK but use existing OpenJDK
                  installed on current machine.
   * noaltcacao:  don't build alternative Cacao VM.
diff --git a/debian/rules b/debian/rules
index d2770ed..a4f964e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,9 +84,12 @@ sdkimg		= images/j2sdk-image
 COMMA=,
 SPACE = $(EMPTY) $(EMPTY)
 
-# 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}
+# Support parallel=<n> in DEB_BUILD_OPTIONS (see #209008)
+# Set NJOBS to 1 to make the build log comparable
+ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+  NJOBS = $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+endif
+#NJOBS=1
 
 # Extracting debug symbols done by dh_strip
 export ALT_OBJCOPY=fake
@@ -458,7 +461,7 @@ else
   CONFIGURE_ARGS += --disable-docs
 endif
 
-CONFIGURE_ARGS += --with-num-cores=$(NUM_PROC)
+CONFIGURE_ARGS += --with-num-cores=$(NJOBS)
 
 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