Source: eigen3
Followup-For: Bug #784269

Dear Maintainer,

Here is a debdiff for fixing this issue.

-Andrew
diff -Nru eigen3-3.2.2/debian/changelog eigen3-3.2.2/debian/changelog
--- eigen3-3.2.2/debian/changelog	2014-09-09 05:03:43.000000000 +0800
+++ eigen3-3.2.2/debian/changelog	2015-05-05 04:33:43.000000000 +0800
@@ -1,3 +1,10 @@
+eigen3 (3.2.2-3.1) unstable; urgency=medium
+
+  * debian/rules: drop hardcoded -j$(NUMJOBS) option. Enable -j option if 
+    parallel=n got set in DEB_BUILD_OPTIONS. (Closes: #784269)
+
+ -- Andrew Lee (李健秋) <ajq...@debian.org>  Tue, 05 May 2015 02:58:14 +0800
+
 eigen3 (3.2.2-3) unstable; urgency=medium
 
   * [b8a0d9f] Fix compilation warning in LDLT.h
diff -Nru eigen3-3.2.2/debian/rules eigen3-3.2.2/debian/rules
--- eigen3-3.2.2/debian/rules	2013-10-13 15:06:54.000000000 +0800
+++ eigen3-3.2.2/debian/rules	2015-05-05 04:15:48.000000000 +0800
@@ -5,7 +5,11 @@
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
 
 export DEB_BUILD_MAINT_OPTIONS := hardening=+all
-export NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	    MAKEFLAGS += -j$(NUMJOBS)
+endif
 
 sse_archs = amd64 i386 kfreebsd-amd64 kfreebsd-i386
 
@@ -28,10 +32,10 @@
 
 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

Reply via email to