diffstat of debian/ for eigen3_3.2.1-2 eigen3_3.2.1-2endless1

 changelog |    9 +++++++++
 rules     |   12 ++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff -Nru eigen3-3.2.1/debian/changelog eigen3-3.2.1/debian/changelog
--- eigen3-3.2.1/debian/changelog	2014-05-11 21:13:00.000000000 +0000
+++ eigen3-3.2.1/debian/changelog	2014-05-14 21:17:27.000000000 +0000
@@ -1,3 +1,12 @@
+eigen3 (3.2.1-2endless1) eos; urgency=low
+
+  * debian/rules: fixed logic to not set "-j" if cannot determine
+      NUMBJOBS from DEB_BUILD_OPTIONS; otherwise, there is no
+      limit on the number of parallel jobs, and the build system
+      quickly runs out of memory
+
+ -- Roddy Shuler <roddy@endlessm.com>  Wed, 14 May 2014 14:14:43 -0700
+
 eigen3 (3.2.1-2) unstable; urgency=medium
 
   * [2044fe6] Add autopkgtest.
diff -Nru eigen3-3.2.1/debian/rules eigen3-3.2.1/debian/rules
--- eigen3-3.2.1/debian/rules	2013-10-13 07:06:54.000000000 +0000
+++ eigen3-3.2.1/debian/rules	2014-05-14 21:46:04.000000000 +0000
@@ -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