r2441 - glibc-package/trunk/debian
Author: aurel32
Date: 2007-07-22 22:40:20 +0000 (Sun, 22 Jul 2007)
New Revision: 2441
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules
Log:
* Honor parallel= option in DEB_BUILD_OPTIONS. Closes: #413744.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-07-22 22:28:36 UTC (rev 2440)
+++ glibc-package/trunk/debian/changelog 2007-07-22 22:40:20 UTC (rev 2441)
@@ -19,6 +19,7 @@
with empty LD_LIBRARY_PATH variable.
* rules.d/build.mk: create /etc/ld.so.conf.d/libc.conf to add
/usr/local/lib as a default search path. Closes: #395177.
+ * Honor parallel= option in DEB_BUILD_OPTIONS. Closes: #413744.
[ Pierre Habouzit ]
* rules.d/debhelper.mk: add some magic to copy debian/bug/$pkg/ files into
@@ -47,7 +48,7 @@
* hurd-i386/submitted-ECANCELED.diff: new patch to fix ECANCELED value.
Closes: #396135.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 23 Jul 2007 00:27:51 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 23 Jul 2007 00:36:13 +0200
glibc (2.6-2) unstable; urgency=low
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2007-07-22 22:28:36 UTC (rev 2440)
+++ glibc-package/trunk/debian/rules 2007-07-22 22:40:20 UTC (rev 2441)
@@ -69,22 +69,12 @@
KERNEL_HOST_CPU := $(subst powerpc,ppc,$(DEB_HOST_GNU_CPU))
# Support multiple makes at once based on number of processors
-# Common wisdom says parallel make can be up to 2n+1.
-# Should we do that to get faster builds?
-NJOBS:=$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
-ifeq ($(NJOBS),-1)
- NJOBS:=1
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+NJOBS := 1
endif
-ifeq ($(NJOBS),0)
- NJOBS=1
-endif
-
-# We can override its value by SETNJOBS environment variable.
-ifdef SETNJOBS
- NJOBS:=$(SETNJOBS)
-endif
-
# Default setup
GLIBC_PASSES ?= libc
Reply to: