[Pkg-mc-commits] r288 - trunk/debian

[Denis Briand]

Author: narcan-guest
Date: 2009-10-27 22:27:22 +0000 (Tue, 27 Oct 2009)
New Revision: 288

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
NUMJOBS is now set by user (Closes: #549658)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-27 21:58:02 UTC (rev 287)
+++ trunk/debian/changelog	2009-10-27 22:27:22 UTC (rev 288)
@@ -33,8 +33,10 @@
   * Allow Debian Maintainers Uploads.
   * Use sensible-editor to edit files (Closes: #549202).
   * Downgrade imagemagick dependency to Suggests (Closes: #550234).
+  * Use DEB_BUILD_OPTIONS to chose the number of building processes
+    (Closes: #549658).
 
- -- Denis Briand <denis at narcan.fr>  Fri, 02 Oct 2009 21:29:52 +0200
+ -- Denis Briand <denis at narcan.fr>  Tue, 27 Oct 2009 23:23:38 +0100
 
 mc (2:4.7.0-pre1-3) unstable; urgency=low
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-10-27 21:58:02 UTC (rev 287)
+++ trunk/debian/rules	2009-10-27 22:27:22 UTC (rev 288)
@@ -7,13 +7,14 @@
 DEB_DH_STRIP_ARGS := --dbg-package=mc-dbg
 DEB_CONFIGURE_EXTRA_FLAGS := --with-glib2 --without-ext2undel --enable-charset --without-samba --with-screen=slang
 AWK := awk
-#improve build time on i386 and amd64 multi CPU.
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifneq (,$(filter $(DEB_BUILD_ARCH),i386 amd64))
-NUMJOBS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+
+#use building with n parallel processes with DEB_BUILD_OPTIONS=parallel=n
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 MAKEFLAGS += -j$(NUMJOBS)
 endif
 
+
 cleanbuilddir/mc::
 	rm -f po/*.gmo
 	rm -f po/stamp-po