[Glibc-bsd-commits] r5278 - trunk/zfsutils/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-30 17:35:20 +0000 (Mon, 30 Dec 2013)
New Revision: 5278

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/rules
Log:
Correctly setup BSD version of MAKEFLAGS to support parallel builds.

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2013-12-30 17:15:04 UTC (rev 5277)
+++ trunk/zfsutils/debian/changelog	2013-12-30 17:35:20 UTC (rev 5278)
@@ -3,6 +3,7 @@
   * Library dependency cleanup: Remove gratuitous dependencies, add
     missing dependencies and build libavl as a shared object.
   * Fetch source code securely (https) in get-orig-source.
+  * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
 
  -- Robert Millan <rmh at debian.org>  Sun, 01 Dec 2013 14:03:01 +0100
 

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2013-12-30 17:15:04 UTC (rev 5277)
+++ trunk/zfsutils/debian/rules	2013-12-30 17:35:20 UTC (rev 5278)
@@ -21,6 +21,13 @@
 	CFLAGS += -O2
 endif
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+
+	# Do not mess with MAKEFLAGS until we transfer control to BSD make (see below)
+	BSD_MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 full_version	:= $(shell dpkg-parsechangelog | grep ^Version: | sed -e 's/^.*: //g')
 tar_version	:= $(shell echo $(full_version) | sed -e 's/-.*//g')
 svn_revision	:= $(shell echo $(full_version) | sed -e 's/.*~svn\([0-9]*\)-[0-9]*/\1/g')
@@ -39,7 +46,9 @@
 
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 \
+PMAKE = \
+	MAKEFLAGS=$(BSD_MAKEFLAGS) \
+	COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 \
         NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
 export SHLIB_MAJOR = 1
 export SHLIBDIR = ./