[med-svn] r17488 - trunk/packages/insighttoolkit/trunk/debian/patches

[Gert Wollny]

Author: gert-guest
Date: 2014-07-21 16:10:04 +0000 (Mon, 21 Jul 2014)
New Revision: 17488

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/0001_donot_include_emmintr_without_sse2_enabled.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/patches/series
Log:
Add patch that tests for SSE2 support before including emminsitr.h

Added: trunk/packages/insighttoolkit/trunk/debian/patches/0001_donot_include_emmintr_without_sse2_enabled.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/0001_donot_include_emmintr_without_sse2_enabled.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/0001_donot_include_emmintr_without_sse2_enabled.patch	2014-07-21 16:10:04 UTC (rev 17488)
@@ -0,0 +1,21 @@
+Description: Only include emmintrin.h if SSE2 is enabled. This should fix the problems 
+ with gccxml on i386 
+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..5a7c456 100644
+--- a/Modules/Core/Common/include/itkMathDetail.h
++++ b/Modules/Core/Common/include/itkMathDetail.h
+@@ -39,9 +39,9 @@
+ #include <fenv.h> // should this be cfenv?
+ #endif /* ITK_HAVE_FENV_H */
+ 
+-#ifdef ITK_HAVE_EMMINTRIN_H
++#if defined(ITK_HAVE_EMMINTRIN_H) && defined(__SSE2__)
+ #include <emmintrin.h> // sse 2 intrinsics
+-#endif /* ITK_HAVE_EMMINTRIN_H */
++#endif /* ITK_HAVE_EMMINTRIN_H  && __SSE2__ */
+ 
+ // assume no SSE2:
+ #define USE_SSE2_64IMPL 0

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2014-07-21 04:54:18 UTC (rev 17487)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2014-07-21 16:10:04 UTC (rev 17488)
@@ -1,5 +1,6 @@
 nrrdio-linking.patch
 bsd-hdf5.patch
 0005-make-gdcm-helper-library-static.patch
+0001_donot_include_emmintr_without_sse2_enabled.patch
 0002_OtsuMultipleThresholdsCalculator-accurray.patch
 0003_VoronoiSegmentationTestTolerance.patch