[SCM] ffado/master: Simplify resolving parallel compilation using example in Debian Policy.

js at users.alioth.debian.org js at users.alioth.debian.org
Mon Sep 20 23:10:55 UTC 2010


The following commit has been merged in the master branch:
commit 2a1a2a2c18a33c6725e33fcac5b80a7e68b243ea
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Sep 21 01:03:39 2010 +0200

    Simplify resolving parallel compilation using example in Debian Policy.

diff --git a/debian/rules b/debian/rules
index fda4753..d0ea412 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,15 +22,9 @@ CFLAGS += "-fPIC"
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
-	PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \
-		sed -e 's/.*parallel=\([0-9]\+\).*/\1/')
-	ifeq ($(DEB_BUILD_OPTIONS),$(PARALLEL_JOBS))
-		PARALLEL_JOBS := $(shell if [ -f /proc/cpuinfo ]; \
-			then echo `cat /proc/cpuinfo | grep 'processor' | wc -l`; \
-			else echo 1; fi)
-	endif
-	NJOBS := -j$(PARALLEL_JOBS)
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NJOBS += -j$(NUMJOBS)
 endif
 
 ifneq (,$(findstring power,$(DEB_BUILD_ARCH)))

-- 
Free Firewire Audio Drivers (ffado.org) packaging



More information about the pkg-multimedia-commits mailing list