[Glibc-bsd-commits] r5267 - trunk/freebsd-buildutils/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-29 19:38:33 +0000 (Sun, 29 Dec 2013)
New Revision: 5267

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

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2013-12-28 23:57:49 UTC (rev 5266)
+++ trunk/freebsd-buildutils/debian/changelog	2013-12-29 19:38:33 UTC (rev 5267)
@@ -1,3 +1,9 @@
+freebsd-buildutils (10.0~svn259404-4) UNRELEASED; urgency=low
+
+  * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 29 Dec 2013 20:38:18 +0100
+
 freebsd-buildutils (10.0~svn259404-3) unstable; urgency=low
 
   * Fix aicasm install path.

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2013-12-28 23:57:49 UTC (rev 5266)
+++ trunk/freebsd-buildutils/debian/rules	2013-12-29 19:38:33 UTC (rev 5267)
@@ -46,6 +46,13 @@
 ORIGDIR = $(SOURCE)-$(tar_version)
 TARNAME = $(SOURCE)_$(tar_version).orig.tar.gz
 
+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
+
 export CFLAGS = -O2 -g -Wall -D_GNU_SOURCE \
          -DMACHINE_ARCH='"$(MACHINE_ARCH)"' \
          -DMACHINE_MULTIARCH='"$(MACHINE_MULTIARCH)"' \
@@ -56,8 +63,12 @@
 MAKE_BUILD_FLAGS = CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
 
 PMAKE_FLAGS = -m $(CURDIR)/src/share/mk
-PMAKE_BOOTSTRAP = $(CURDIR)/build-tree/src/usr.bin/make/pmake $(PMAKE_FLAGS)
-PMAKE = $(CURDIR)/build-tree/src/usr.bin/make/fmake $(PMAKE_FLAGS)
+PMAKE_BOOTSTRAP = \
+	MAKEFLAGS=$(BSD_MAKEFLAGS) \
+	$(CURDIR)/build-tree/src/usr.bin/make/pmake $(PMAKE_FLAGS)
+PMAKE = \
+	MAKEFLAGS=$(BSD_MAKEFLAGS) \
+	$(CURDIR)/build-tree/src/usr.bin/make/fmake $(PMAKE_FLAGS)
 YACC = byacc
 
 package = $(SOURCE)