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

[Steven Michael Robbins]

Author: smr
Date: 2009-07-19 17:51:30 +0000 (Sun, 19 Jul 2009)
New Revision: 3663

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Remove parallel build, since it is broken.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2009-07-18 14:45:42 UTC (rev 3662)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2009-07-19 17:51:30 UTC (rev 3663)
@@ -2,13 +2,15 @@
 
   * New upstream.
   
-  * control (libinsighttoolkit3-dev): Add Recommends dependency on
-    uuid-dev.  Closes: #519724.  Change dependency on libfftw3-dev from
-    Depends to Recommends.
-
   * control.in: New.  Template file to generate control using
     "control-file" rule.
-  
+
+  * control.in (libinsighttoolkit3-dev): Add Recommends dependency on uuid-dev.
+    Closes: #519724.  Change dependency on libfftw3-dev from Depends to
+    Recommends.
+
+  * rules: Remove parallel build, since it is broken.  Closes: #536999.
+
   * itkwish.1: New.
 
  -- Steve M. Robbins <smr at debian.org>  Thu, 16 Jul 2009 00:58:10 -0500

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2009-07-18 14:45:42 UTC (rev 3662)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2009-07-19 17:51:30 UTC (rev 3663)
@@ -32,9 +32,13 @@
 DEB_DESTDIR = $(CURDIR)/debian/tmp
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR)
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	DEB_MAKE_BUILD_TARGET = -j$(NUMJOBS) all
+# 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