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

[smr at alioth.debian.org]

Author: smr
Date: 2008-05-31 04:57:14 +0000 (Sat, 31 May 2008)
New Revision: 1937

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/gccxml-workaround.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
New patch to work around gccxml bug where -I/usr/include breaks #include_next.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2008-05-31 04:56:04 UTC (rev 1936)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2008-05-31 04:57:14 UTC (rev 1937)
@@ -1,3 +1,10 @@
+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.
+
+ -- Steve M. Robbins <smr at debian.org>  Fri, 30 May 2008 23:53:42 -0500
+
 insighttoolkit (3.6.0-2) unstable; urgency=low
 
   * debian/patches/pythonfiles-install.patch: New.  Remove argument

Added: trunk/packages/insighttoolkit/trunk/debian/patches/gccxml-workaround.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/gccxml-workaround.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/gccxml-workaround.patch	2008-05-31 04:57:14 UTC (rev 1937)
@@ -0,0 +1,18 @@
+Do not add -I/usr/include to gccxml options.  Doing so breaks #include_next,
+which is heavily used in GCC 4.3.
+
+This is GCCXML bug 7134; see http://www.gccxml.org/Bug/view.php?id=7134.
+
+--- insighttoolkit-3.6.0.orig/Wrapping/CSwig/CMakeLists.txt
++++ insighttoolkit-3.6.0/Wrapping/CSwig/CMakeLists.txt
+@@ -749,7 +749,9 @@
+   SET(SWIG_INC_FILE ${WrapITK_BINARY_DIR}/${DIRECTORY}/SwigInc.txt)
+   SET(SWIG_INC_CONTENTS)
+   FOREACH(dir ${SWIG_INC})
+-    SET(SWIG_INC_CONTENTS "${SWIG_INC_CONTENTS}-I${dir}\n")
++    IF(NOT ${dir} STREQUAL "/usr/include")
++      SET(SWIG_INC_CONTENTS "${SWIG_INC_CONTENTS}-I${dir}\n")
++    ENDIF(NOT ${dir} STREQUAL "/usr/include")
+   ENDFOREACH(dir)
+   CONFIGURE_FILE(${WrapITK_SOURCE_DIR}/SwigInc.txt.in ${SWIG_INC_FILE}
+     @ONLY IMMEDIATE)

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2008-05-31 04:56:04 UTC (rev 1936)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2008-05-31 04:57:14 UTC (rev 1937)
@@ -1,3 +1,4 @@
+gccxml-workaround.patch
 03_examples.patch
 gcc43.patch