[Glibc-bsd-commits] r5271 - in trunk: ctfutils/debian freebsd-glue/debian freebsd-libs/debian freebsd-smbfs/debian freebsd-utils/debian kfreebsd-10/debian kfreebsd-11/debian

rmh at alioth.debian.org rmh at alioth.debian.org
Sun Dec 29 20:04:08 UTC 2013 

Author: rmh
Date: 2013-12-29 20:04:08 +0000 (Sun, 29 Dec 2013)
New Revision: 5271

Modified:
   trunk/ctfutils/debian/changelog
   trunk/ctfutils/debian/rules
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/debian/rules
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
   trunk/freebsd-smbfs/debian/changelog
   trunk/freebsd-smbfs/debian/rules
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/rules
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/rules
   trunk/kfreebsd-11/debian/changelog
   trunk/kfreebsd-11/debian/rules
Log:
Correctly setup BSD version of MAKEFLAGS to support parallel builds.

Modified: trunk/ctfutils/debian/changelog
===================================================================
--- trunk/ctfutils/debian/changelog	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/ctfutils/debian/changelog	2013-12-29 20:04:08 UTC (rev 5271)
@@ -2,6 +2,7 @@
 
   * Set Maintainer to debian-bsd.
   * 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>  Sat, 30 Nov 2013 01:05:58 +0100
 

Modified: trunk/ctfutils/debian/rules
===================================================================
--- trunk/ctfutils/debian/rules	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/ctfutils/debian/rules	2013-12-29 20:04:08 UTC (rev 5271)
@@ -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 \
 	OPENSOLARIS_USR_DISTDIR="$(CURDIR)/cddl/contrib/opensolaris" \
 	OPENSOLARIS_SYS_DISTDIR="$(CURDIR)/sys/cddl/contrib/opensolaris" \
         NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/freebsd-glue/debian/changelog	2013-12-29 20:04:08 UTC (rev 5271)
@@ -1,3 +1,9 @@
+freebsd-glue (0.2.8) UNRELEASED; urgency=low
+
+  * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 29 Dec 2013 20:44:42 +0100
+
 freebsd-glue (0.2.7) unstable; urgency=low
 
   * Remove getpeereid(), use version from libbsd instead.

Modified: trunk/freebsd-glue/debian/rules
===================================================================
--- trunk/freebsd-glue/debian/rules	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/freebsd-glue/debian/rules	2013-12-29 20:04:08 UTC (rev 5271)
@@ -3,14 +3,23 @@
 
 export SHELL = bash
 
+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
+
 DESTDIR = $(CURDIR)/debian/tmp
 PATH := /usr/lib/freebsd:$(PATH)
 PMAKE := \
+	MAKEFLAGS=$(BSD_MAKEFLAGS) \
 	MAKEOBJDIRPREFIX=$(CURDIR)/obj-deb \
 	CFLAGS="$(CFLAGS) -O2" \
 	DESTDIR="$(DESTDIR)" \
 	make
 PMAKE_UDEB := \
+	MAKEFLAGS=$(BSD_MAKEFLAGS) \
 	MAKEOBJDIRPREFIX=$(CURDIR)/obj-udeb \
 	CFLAGS="$(CFLAGS) -Os" \
 	DESTDIR="$(DESTDIR)-udeb" \

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/freebsd-libs/debian/changelog	2013-12-29 20:04:08 UTC (rev 5271)
@@ -3,6 +3,7 @@
   * Fetch source code securely (https) in get-orig-source.
   * Leave -lbsdxml untouched (latest freebsd-glue supports it).
   * Make libipx available on all architectures.
+  * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
 
  -- Robert Millan <rmh at debian.org>  Sat, 07 Dec 2013 23:22:56 +0100
 

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/freebsd-libs/debian/rules	2013-12-29 20:04:08 UTC (rev 5271)
@@ -28,6 +28,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
+
 SOURCE = freebsd-libs
 SVN		:= https://svn0.us-west.freebsd.org/base/release/$(version).0
 #SVN		:= https://svn0.us-west.freebsd.org/base/releng/$(version)
@@ -38,7 +45,9 @@
 
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
-PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -I$(CURDIR)/debian/local/include" NO_WERROR=1 NOGCCERROR=1 \
+PMAKE = \
+	MAKEFLAGS=$(BSD_MAKEFLAGS) \
+	COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS) -I$(CURDIR)/debian/local/include" NO_WERROR=1 NOGCCERROR=1 \
         NOSHARED=NO NO_SHARED=NO NO_PROFILE=1 DESTDIR=$(DESTDIR) make
 kernel = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 

Modified: trunk/freebsd-smbfs/debian/changelog
===================================================================
--- trunk/freebsd-smbfs/debian/changelog	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/freebsd-smbfs/debian/changelog	2013-12-29 20:04:08 UTC (rev 5271)
@@ -7,8 +7,9 @@
   * Fetch source code securely (https) in get-orig-source.
   * Remove obsolete getvfsbyname.diff (getvfsbyname() is now provided by
     glibc).
+  * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
 
- -- Guillem Jover <guillem at debian.org>  Mon, 29 Jul 2013 12:31:38 +0200
+ -- Robert Millan <rmh at debian.org>  Sun, 29 Dec 2013 21:00:51 +0100
 
 freebsd-smbfs (9.0~svn227117-2) unstable; urgency=low
 

Modified: trunk/freebsd-smbfs/debian/rules
===================================================================
--- trunk/freebsd-smbfs/debian/rules	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/freebsd-smbfs/debian/rules	2013-12-29 20:04:08 UTC (rev 5271)
@@ -19,6 +19,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')
@@ -37,7 +44,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
 
 get-orig-source:

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/freebsd-utils/debian/changelog	2013-12-29 20:04:08 UTC (rev 5271)
@@ -3,6 +3,7 @@
   * Add /etc/sysctl.conf. It used to be provided by procps, but now it
     isn't. Its content is kernel-specific anyway, so let's just use the
     FreeBSD version.
+  * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
 
  -- Robert Millan <rmh at debian.org>  Fri, 27 Dec 2013 13:59:57 +0100
 

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/freebsd-utils/debian/rules	2013-12-29 20:04:08 UTC (rev 5271)
@@ -22,6 +22,13 @@
 	CXXFLAGS += -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')
@@ -42,12 +49,14 @@
 PATH := /usr/lib/freebsd:$(PATH)
 DESTDIR = $(CURDIR)/debian/tmp
 PMAKE = \
+	MAKEFLAGS=$(BSD_MAKEFLAGS) \
 	MAKEOBJDIRPREFIX=$(CURDIR)/obj-deb \
 	CFLAGS="$(CFLAGS)" \
 	NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO \
 	DESTDIR="$(DESTDIR)" \
 	make -C src $(PMAKE_FLAGS)
 PMAKE_UDEB = \
+	MAKEFLAGS=$(BSD_MAKEFLAGS) \
 	MAKEOBJDIRPREFIX=$(CURDIR)/obj-udeb \
 	CFLAGS="$(CFLAGS) -Os" \
 	NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO \

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/kfreebsd-10/debian/changelog	2013-12-29 20:04:08 UTC (rev 5271)
@@ -1,6 +1,7 @@
 kfreebsd-10 (10.0~svn259778-2) UNRELEASED; urgency=low
 
   * Only assert linker.hints presence on kfreebsd-any.
+  * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
 
  -- Robert Millan <rmh at debian.org>  Fri, 27 Dec 2013 14:23:16 +0100
 

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/kfreebsd-10/debian/rules	2013-12-29 20:04:08 UTC (rev 5271)
@@ -43,9 +43,21 @@
 FLAVOR_DIR	:= flavor-$(version)-$(abiname)
 ORIG_DIR	:= $(source)-$(tar_version)
 ORIG_TAR	:= $(source)_$(tar_version).orig.tar.xz
-MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) -DWITHOUT_SOURCELESS
 PATH		:= /usr/lib/freebsd:$(PATH)
 
+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
+
+MAKE		:= \
+		MAKEFLAGS=$(BSD_MAKEFLAGS) \
+		make \
+		MACHINE_ARCH=$(kfreebsd_cpu) \
+		-DWITHOUT_SOURCELESS
+
 # Clang is the default compiler on these architectures (see src/share/mk/bsd.own.mk)
 clang_cpus	:= i386 amd64 arm
 

Modified: trunk/kfreebsd-11/debian/changelog
===================================================================
--- trunk/kfreebsd-11/debian/changelog	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/kfreebsd-11/debian/changelog	2013-12-29 20:04:08 UTC (rev 5271)
@@ -1,6 +1,7 @@
 kfreebsd-11 (11.0~svn259528-3) UNRELEASED; urgency=low
 
   * Only assert linker.hints presence on kfreebsd-any.
+  * Correctly setup BSD version of MAKEFLAGS to support parallel builds.
 
  -- Robert Millan <rmh at debian.org>  Fri, 27 Dec 2013 14:23:10 +0100
 

Modified: trunk/kfreebsd-11/debian/rules
===================================================================
--- trunk/kfreebsd-11/debian/rules	2013-12-29 20:03:55 UTC (rev 5270)
+++ trunk/kfreebsd-11/debian/rules	2013-12-29 20:04:08 UTC (rev 5271)
@@ -41,9 +41,21 @@
 HEADERS_DIR	:= kfreebsd-headers-$(version)-$(abiname)
 ORIG_DIR	:= kfreebsd-$(major)-$(tar_version)
 ORIG_TAR	:= kfreebsd-$(major)_$(tar_version).orig.tar.xz
-MAKE		:= make MACHINE_ARCH=$(kfreebsd_cpu) -DWITHOUT_SOURCELESS
 PATH		:= /usr/lib/freebsd:$(PATH)
 
+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
+
+MAKE		:= \
+		MAKEFLAGS=$(BSD_MAKEFLAGS) \
+		make \
+		MACHINE_ARCH=$(kfreebsd_cpu) \
+		-DWITHOUT_SOURCELESS
+
 # Clang is the default compiler on these architectures (see src/share/mk/bsd.own.mk)
 clang_cpus	:= i386 amd64 armel

More information about the Glibc-bsd-commits mailing list