[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090204-79-g9c9de60

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9c9de606f7d021980a04a84a3575be9b80a541a2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Mar 2 22:44:42 2009 +0100

    improve parallel builds on SMP/multicores
    
    On i386 and amd64, the system is asked for the number of online
    processors using the getconf utility. This can always be overriden using
    the DEB_BUILD_OPTIONS variable, as outline in section 4.9.1 in the
    debian policy.

diff --git a/debian/rules b/debian/rules
index cea8590..95cfb13 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,17 @@ ifneq ($(DEB_SOURCE),ffmpeg-debian)
 DEB_BUILD_OPTIONS += ,internalencoders
 endif
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+# on i386 and amd64, we query the system unless overriden by DEB_BUILD_OPTIONS
+ifeq      ($(DEB_HOST_ARCH),i386)
+NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+else ifeq ($(DEB_HOST_ARCH),amd64)
+NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+endif
+endif
+
 internalencoders := $(findstring internalencoders,$(DEB_BUILD_OPTIONS))
 
 include debian/confflags
@@ -47,7 +58,7 @@ endif
 build-%: build-stamp-%
 build-stamp-%: configure-stamp-%
 	dh_testdir
-	$(MAKE) -C debian-$* -j $(NJOBS)
+	$(MAKE) -C debian-$* $(NUMJOBS)
 	touch $@
 
 debian-shared/tools/qt-faststart: build-stamp-shared

-- 
FFmpeg packaging