honor dpkg-buildflags and DEB_BUILD_OPTIONS better, #727196

[debian/tar] / debian / rules

diff --git a/debian/rules b/debian/rules
index 5ab1d39a84da58d0ab4e8e756b425635cfa0f41b..8adc9887943d67aca801430f85ba31df790a0469 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,11 @@ CFLAGS += -Wall
 LDFLAGS += `dpkg-buildflags --get LDFLAGS`
 CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir
@@ -29,7 +34,8 @@ build-arch: build-stamp
 build-indep: build-stamp
 build-stamp: configure-stamp
        dh_testdir
-       RSH="/usr/bin/rsh" CFLAGS="-O2 -g -Wall -fno-gnu89-inline" $(MAKE)
+       RSH="/usr/bin/rsh" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
+               LDFLAGS="$(LDFLAGS)" $(MAKE)
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))