[med-svn] r2568 - trunk/packages/minc/trunk/debian

[smr at alioth.debian.org]

Author: smr
Date: 2008-10-12 04:57:40 +0000 (Sun, 12 Oct 2008)
New Revision: 2568

Modified:
   trunk/packages/minc/trunk/debian/changelog
   trunk/packages/minc/trunk/debian/rules
Log:
Support parallel keyword in DEB_BUILD_OPTIONS.  Fix setting of CFLAGS so that the alpha-only addition still works.

Modified: trunk/packages/minc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/trunk/debian/changelog	2008-10-12 04:51:01 UTC (rev 2567)
+++ trunk/packages/minc/trunk/debian/changelog	2008-10-12 04:57:40 UTC (rev 2568)
@@ -14,8 +14,10 @@
   
   * debian/patches/04_manpages.diff: Fix errors in manpages, mainly
     removal of trailing TAB characters.
+  
+  * debian/rules: Adhere to parallel keyword in DEB_BUILD_OPTIONS.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 11 Oct 2008 23:49:34 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sat, 11 Oct 2008 23:55:42 -0500
 
 minc (2.0.15-3) unstable; urgency=low
 

Modified: trunk/packages/minc/trunk/debian/rules
===================================================================
--- trunk/packages/minc/trunk/debian/rules	2008-10-12 04:51:01 UTC (rev 2567)
+++ trunk/packages/minc/trunk/debian/rules	2008-10-12 04:57:40 UTC (rev 2568)
@@ -4,9 +4,7 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-shared --enable-minc2 --enable-acr-nema CFLAGS="-I/usr/include/mpi"
-DEB_MAKE_BUILD_TARGET = all 
-#DEB_MAKE_CHECK_TARGET = check
+CFLAGS = -I/usr/include/mpi
 
 # This should fix #368263
 ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
@@ -14,6 +12,15 @@
 	CFLAGS += -mieee
 endif
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-shared --enable-minc2 --enable-acr-nema CFLAGS="$(CFLAGS)"
+DEB_MAKE_BUILD_TARGET = all 
+#DEB_MAKE_CHECK_TARGET = check
+
 ps_docs = doc/prog_ref.ps doc/prog_guide.ps volume_io/Documentation/volume_io.ps
 
 build/libminc-dev:: $(ps_docs)