[SCM] Eigen3 packaging. branch, master, updated. debian/3.1.3-1_exp1-5-g9f75cb8

Anton Gladky gladky.anton at gmail.com
Mon May 6 19:20:35 UTC 2013


The following commit has been merged in the master branch:
commit 60b2388b0482e77374f36fdcca28732dff3db0d1
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon May 6 20:56:38 2013 +0200

    Respect nocheck option.

diff --git a/debian/rules b/debian/rules
index 1124fa7..fd93fc2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ BUILDDIR = $(CURDIR)/debian/build
 	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --parallel
 
 export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+export NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 
 disable_auto_test_archs = mips mipsel armel armhf
 
@@ -15,14 +16,11 @@ override_dh_installchangelogs:
 	dh_installchangelogs debian/Changelog_upstream
 
 override_dh_auto_test:
-ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_auto_test_archs)))
-	echo -- Running tests.
-	-cat /proc/meminfo
-	-cat /proc/cpuinfo
-	cd $(BUILDDIR); $(MAKE) buildtests
-	dh_auto_test -- ARGS=-VV
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	cd $(BUILDDIR); $(MAKE) -j$(NUMJOBS) buildtests
+	dh_auto_test -- -j$(NUMJOBS) ARGS=-VV
 endif
 
 override_dh_auto_build-indep:
-	cd $(BUILDDIR); $(MAKE) doc
+	cd $(BUILDDIR); $(MAKE) -j$(NUMJOBS) doc
 	rm -f $(BUILDDIR)/doc/html/unsupported/installdox

-- 
Eigen3 packaging. 



More information about the debian-science-commits mailing list