[med-svn] r19612 - in trunk/packages/vxl/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-07-15 14:55:35 +0000 (Wed, 15 Jul 2015)
New Revision: 19612

Added:
   trunk/packages/vxl/trunk/debian/patches/unset-cmake-variables.patch
Modified:
   trunk/packages/vxl/trunk/debian/changelog
   trunk/packages/vxl/trunk/debian/patches/series
Log:
Unset Cmake variables on configuration change


Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog	2015-07-15 08:10:42 UTC (rev 19611)
+++ trunk/packages/vxl/trunk/debian/changelog	2015-07-15 14:55:35 UTC (rev 19612)
@@ -4,10 +4,11 @@
   * Apply patch from fedora (Thanks to Brett Johnson <brett at hp.com> for
     forwarding)
     Closes: #778165
-  TODO: Build error
-     fatal error: libc.h: No such file or directory
+  * Unset Cmake variables on configuration change (thanks for the patch to
+    Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>)
+    Closes: #788559
 
- -- Andreas Tille <tille at debian.org>  Thu, 25 Jun 2015 11:12:23 +0200
+ -- Andreas Tille <tille at debian.org>  Wed, 15 Jul 2015 15:33:32 +0200
 
 vxl (1.17.0.dfsg-1) unstable; urgency=low
 

Modified: trunk/packages/vxl/trunk/debian/patches/series
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/series	2015-07-15 08:10:42 UTC (rev 19611)
+++ trunk/packages/vxl/trunk/debian/patches/series	2015-07-15 14:55:35 UTC (rev 19612)
@@ -19,3 +19,4 @@
 #compflags.patch
 libav10.patch
 gcc-5x.patch
+unset-cmake-variables.patch

Added: trunk/packages/vxl/trunk/debian/patches/unset-cmake-variables.patch
===================================================================
--- trunk/packages/vxl/trunk/debian/patches/unset-cmake-variables.patch	                        (rev 0)
+++ trunk/packages/vxl/trunk/debian/patches/unset-cmake-variables.patch	2015-07-15 14:55:35 UTC (rev 19612)
@@ -0,0 +1,19 @@
+Description: Unset Cmake variables on configuration change
+ Previously they have been set to arbitrary values, but that confuses
+ recent versions of cmake.
+
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Bug-Debian: https://bugs.debian.org/788559
+Last-Update: <2015-07-15>
+
+--- a/v3p/dcmtk/CMakeLists.txt
++++ b/v3p/dcmtk/CMakeLists.txt
+@@ -113,7 +113,7 @@ ELSE( ${DCMTK_CONFIG_SERIAL_CURRENT} MAT
+         DCMTK_SIZEOF_LONG
+         DCMTK_CMAKE_COMPILER_IS_GNUCXX_2XX
+         HAVE_DCMTK_SIZEOF_LONG )  # Created indirectly by CHECK_TYPE_SIZE
+-    SET( ${var} ${var} )
++    UNSET( ${var} )
+   ENDFOREACH( var )
+ 
+   # Record that we've done the new config.