[med-svn] r1942 - in trunk/packages/insighttoolkit/trunk/debian: . patches

[smr at alioth.debian.org]

Author: smr
Date: 2008-05-31 17:11:31 +0000 (Sat, 31 May 2008)
New Revision: 1942

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/sharedforward.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Fix FTBFS errors:

1. For GCC 4.3 systems: work around a gccxml bug.
2. For SPARC systems, patch to ensure not also treated as SUN/sparc.



Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2008-05-31 17:04:26 UTC (rev 1941)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2008-05-31 17:11:31 UTC (rev 1942)
@@ -1,13 +1,19 @@
 insighttoolkit (3.6.0-3) unstable; urgency=low
 
   * debian/patches/gccxml-workaround.patch: New.  Work around gccxml issue
-    with #include_next; c.f. http://www.gccxml.org/Bug/view.php?id=7134.
-  
+    with #include_next; c.f. http://www.gccxml.org/Bug/view.php?id=7134.  
   * debian/patches/gcc43.patch: include <cstring> in itkNeighbourhood.h.
     This only showed up in the tcl wrapping step.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 31 May 2008 11:18:17 -0500
+  * Above two entries fix FTBFS for GCC 4.3-based systems.
+    Closes: #478500.
+  
+  * debian/patches/sharedforward.patch: New.  Ensure that linux/sparc
+    systems are not also configured as a SUN sparc system, which requires
+    SUN header sys/isa_defs.h.  Closes: #478940, #483312.
 
+ -- Steve M. Robbins <smr at debian.org>  Sat, 31 May 2008 12:07:29 -0500
+
 insighttoolkit (3.6.0-2) unstable; urgency=low
 
   * debian/patches/pythonfiles-install.patch: New.  Remove argument

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2008-05-31 17:04:26 UTC (rev 1941)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2008-05-31 17:11:31 UTC (rev 1942)
@@ -1,3 +1,4 @@
+sharedforward.patch
 gccxml-workaround.patch
 03_examples.patch
 gcc43.patch

Added: trunk/packages/insighttoolkit/trunk/debian/patches/sharedforward.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/sharedforward.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/sharedforward.patch	2008-05-31 17:11:31 UTC (rev 1942)
@@ -0,0 +1,20 @@
+The SharedForward.h code configures for a number of different platforms;
+mainly by examining OS-specific symbols, such as __linux.  
+
+For SUN systems, however, the __sparc symbol is used, which defines a
+CPU, not an OS, and is also defined for linux on sparc.  Since the
+linux clause comes first, we just ensure that the system has not
+already been configured.
+
+
+--- insighttoolkit-3.6.0.orig/Utilities/kwsys/SharedForward.h.in
++++ insighttoolkit-3.6.0/Utilities/kwsys/SharedForward.h.in
+@@ -217,8 +217,8 @@
+ #endif
+ 
+ /* SUN */
+-#if defined(__sparc)
++#if defined(__sparc) && !defined(KWSYS_SHARED_FORWARD_LDPATH)
+ # define KWSYS_SHARED_FORWARD_LDD "ldd"
+ # define KWSYS_SHARED_FORWARD_LDD_N 1
+ # include <sys/isa_defs.h>