[med-svn] r17524 - trunk/packages/insighttoolkit/trunk/debian/patches
Gert Wollny
gert-guest at moszumanska.debian.org
Thu Jul 24 16:56:17 UTC 2014
Author: gert-guest
Date: 2014-07-24 16:56:17 +0000 (Thu, 24 Jul 2014)
New Revision: 17524
Modified:
trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch
trunk/packages/insighttoolkit/trunk/debian/patches/0002_dont_test_swig_version_before_looking_for_it.patch
Log:
Update patch descriptions
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch 2014-07-24 16:14:56 UTC (rev 17523)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0001_avoid-includsion-of-emmintr_h_without_sse2.patch 2014-07-24 16:56:17 UTC (rev 17524)
@@ -1,3 +1,8 @@
+Description: on i386 sse2 is not available. Make sure the according header is not
+ included by gccxml.
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Bug: https://issues.itk.org/jira/browse/ITK-3299
+
diff --git a/Modules/Core/Common/include/itkMathDetail.h b/Modules/Core/Common/include/itkMathDetail.h
index 7db8727..6bd5739 100644
--- a/Modules/Core/Common/include/itkMathDetail.h
@@ -18,12 +23,12 @@
#endif
+// Now that it has been established that SSE2 is available,
-+// include the required header.
++// include the required header if this is not gccxml.
+// Note that at this point testing for emmintrin.h is superfluos,
+// if it can't be included now the compiler installation is borked.
+// Still, I keep the test because I don't know why it was put there.
+
-+#if defined(USE_SSE2_32IMPL) || defined(USE_SSE2_64IMPL)
++#if (defined(USE_SSE2_32IMPL) || defined(USE_SSE2_64IMPL)) && !defined(__GCCXML__)
+# ifdef ITK_HAVE_EMMINTRIN_H
+# include <emmintrin.h> // sse 2 intrinsics
+# else
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/0002_dont_test_swig_version_before_looking_for_it.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0002_dont_test_swig_version_before_looking_for_it.patch 2014-07-24 16:14:56 UTC (rev 17523)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0002_dont_test_swig_version_before_looking_for_it.patch 2014-07-24 16:56:17 UTC (rev 17524)
@@ -1,3 +1,8 @@
+Description: cmake tries to read the version of SWIG before it is actually searched for
+ Since this is just awarning about the used swig version, I simply removed the snipped
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Bug: https://issues.itk.org/jira/browse/ITK-3303
+
diff --git a/Wrapping/Generators/SwigInterface/CMakeLists.txt b/Wrapping/Generators/SwigInterface/CMakeLists.txt
index 6e77848..a8e51ca 100644
--- a/Wrapping/Generators/SwigInterface/CMakeLists.txt
More information about the debian-med-commit
mailing list