[eigen3] 03/03: d/rules: drop hardcoded -j$(NUMJOBS) option

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository eigen3.

commit 388a27f817088263e8a264666b09d599e941cf95
Author: Andrew Lee (李健秋) <ajqlee at debian.org>
Date:   Tue May 5 00:13:16 2015 +0200

    d/rules: drop hardcoded -j$(NUMJOBS) option
    
    Better fix for #784269. Enable -j option if
    parallel=n got set in DEB_BUILD_OPTIONS.
---
 debian/rules | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 32bb804..b98cb52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,10 @@ BUILDDIR = $(CURDIR)/debian/build
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
 
 export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	export NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-else
-	NUMJOBS=1
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	    MAKEFLAGS += -j$(NUMJOBS)
 endif
 
 sse_archs = amd64 i386 kfreebsd-amd64 kfreebsd-i386
@@ -32,10 +32,10 @@ override_dh_installchangelogs:
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	cd $(BUILDDIR); $(MAKE) -j$(NUMJOBS) buildtests
-	dh_auto_test -- -j$(NUMJOBS) ARGS=-VV || true
+	cd $(BUILDDIR); $(MAKE) buildtests
+	dh_auto_test ARGS=-VV || true
 endif
 
 override_dh_auto_build-indep:
-	cd $(BUILDDIR); $(MAKE) -j$(NUMJOBS) doc
+	cd $(BUILDDIR); $(MAKE) doc
 	rm -f $(BUILDDIR)/doc/html/unsupported/installdox

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/eigen3.git