[med-svn] [relion] 24/36: d/rules: Get and use parallel option from DEB_BUILD_OPTIONS

[Roland Fehrenbacher]

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

rfehren-guest pushed a commit to branch master
in repository relion.

commit aa3c30e0d366b8a7b2537a6e5640a647be3c7716
Author: Roland Fehrenbacher <rf at q-leap.de>
Date:   Mon Oct 13 13:37:37 2014 +0000

    d/rules: Get and use parallel option from DEB_BUILD_OPTIONS
---
 debian/rules | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6698b1f..866d595 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,8 @@ ifeq ($(DEBVENDOR), Qlustar)
     include /usr/share/ql-deb-utils/Makefile
     MPICXX := mpicxx.openmpi-gcc
 else
+    NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKE_-J := $(addprefix -j, $(NUMJOBS))
     MPICXX := mpicxx.openmpi
 endif
 
@@ -32,13 +34,15 @@ override_dh_auto_build:
 	$(CONFIGURE_COMMON) --enable-gui \
 	  CPPFLAGS="$$(fltk-config --cxxflags)" \
 	  LDFLAGS="$$(fltk-config --ldflags)"
-	make -j 6; make install prefix=$(CURDIR)/debian/tmp/gui/usr; make clean
+	make $(MAKE_-J); make install prefix=$(CURDIR)/debian/tmp/gui/usr; \
+	  make clean
 	# ... then mpitools ...
 	MPICXX=$(MPICXX) $(CONFIGURE_COMMON) --enable-mpi --disable-gui
-	make -j 6; make install prefix=$(CURDIR)/debian/tmp/mpi/usr; make clean
+	make $(MAKE_-J); make install prefix=$(CURDIR)/debian/tmp/mpi/usr; \
+	  make clean
 	# ... then clitools ...
 	$(CONFIGURE_COMMON) --disable-gui
-	make -j 6; make install prefix=$(CURDIR)/debian/tmp/usr
+	make $(MAKE_-J); make install prefix=$(CURDIR)/debian/tmp/usr
 
 override_dh_prep:
 	# We don't want debian/tmp to be removed again ...

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/relion.git