[med-svn] r5142 - trunk/packages/insighttoolkit/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2010-08-19 03:04:40 +0000 (Thu, 19 Aug 2010)
New Revision: 5142

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Enable parallel building.  Target for experimental due to Debian freeze.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2010-08-18 13:44:23 UTC (rev 5141)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2010-08-19 03:04:40 UTC (rev 5142)
@@ -1,4 +1,4 @@
-insighttoolkit (3.20.0-1) unstable; urgency=low
+insighttoolkit (3.20.0-1) experimental; urgency=low
 
   * New upstream.
     - patches/itkTkImageViewer2D.patch: Remove.  Applied upstream.
@@ -6,18 +6,21 @@
 
   * control.in: Adjust gccxml version dependency to match what used to be
     in control.
-  
+
   * rules: Set version variables to 3.20.
   * control: Re-generate for libinsighttoolkit3.20.
 
   * patches/gccxml-workaround.patch: Remove.  Workaround no longer
     required as gccxml was fixed as of 2008-06-02.
-  
+
   * rules: Use "make install/fast" to avoid a rebuild at install time.
     Closes: #587184.
-  
- -- Steve M. Robbins <smr at debian.org>  Tue, 17 Aug 2010 22:06:24 -0500
 
+  * rules: Enable parallel building (fixed upstream in May).  Closes:
+    #578313.
+
+ -- Steve M. Robbins <smr at debian.org>  Wed, 18 Aug 2010 22:03:06 -0500
+
 insighttoolkit (3.18.0-4) unstable; urgency=low
 
   * rules: Use cmake.mk instead of makefile.mk; drop common-configure-arch

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2010-08-18 13:44:23 UTC (rev 5141)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2010-08-19 03:04:40 UTC (rev 5142)
@@ -1,9 +1,12 @@
 #!/usr/bin/make -f
 
+DEB_BUILD_PARALLEL = true
+
 # Using install/fast bypasses the install->all dependency,
 # avoiding a complete rebuild by "make install".
 # See http://www.itk.org/pipermail/insight-users/2010-August/037827.html
 #
+# Override variable set in cmake.mk:
 DEB_MAKE_INSTALL_TARGET = install/fast DESTDIR=$(DEB_DESTDIR)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -41,16 +44,6 @@
 
 TCLMODDIR = usr/share/tcltk/tcl$(TCLVERS)/insighttoolkit$(VER_MAJOR)
 
-# Parallel build of wrapping code is broken (e.g. tcl, python),
-# so can't use DEB_BUILD_OPTIONS.  However parallel build is 
-# useful in limited circumstances, so we leave a hook to enable it.
-#
-ifneq (,$(filter parallel=%,$(SMR_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(SMR_BUILD_OPTIONS)))
-	SMR_MAKE_BUILD_TARGET = -j$(NUMJOBS) all
-endif
-
-
 DEB_CMAKE_EXTRA_FLAGS = \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 	-DBUILD_EXAMPLES:BOOL=OFF \