[med-svn] [Git][med-team/insighttoolkit][master] 3 commits: New patch to fix 32-bit build.

[Steven Robbins (@smr)]

Steven Robbins pushed to branch master at Debian Med / insighttoolkit


Commits:
fe35cde3 by Steve Robbins at 2021-12-12T13:06:28-06:00
New patch to fix 32-bit build.

- - - - -
a02da818 by Steve Robbins at 2021-12-13T00:37:39+00:00
Tidy up rules

- - - - -
b6446c2c by Steve Robbins at 2021-12-12T22:21:35-06:00
Override memory size of i386 build to 2GB.

- - - - -


3 changed files:

- + debian/patches/0002-Do-not-unconditionally-enable-SSE-for-i386.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/patches/0002-Do-not-unconditionally-enable-SSE-for-i386.patch
=====================================
@@ -0,0 +1,21 @@
+From: Steve Robbins <steve at sumost.ca>
+Date: Sun, 12 Dec 2021 13:04:29 -0600
+Subject: Do not unconditionally enable SSE for i386. This breaks the Debian
+ 32-bit builds.
+
+---
+ Modules/Core/Common/src/itkConfigure.h.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Modules/Core/Common/src/itkConfigure.h.in b/Modules/Core/Common/src/itkConfigure.h.in
+index 2d6a109..34c1ec1 100644
+--- a/Modules/Core/Common/src/itkConfigure.h.in
++++ b/Modules/Core/Common/src/itkConfigure.h.in
+@@ -190,7 +190,6 @@
+ #endif
+ 
+ #if defined(ITK_COMPILER_SUPPORTS_SSE2_64) || \
+-    defined(__i386__) || \
+     (defined(_M_IX86_FP) && (_M_IX86_FP >= 2))
+ #  define ITK_COMPILER_SUPPORTS_SSE2_32
+ #endif


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 0001-Fix-building-and-running-with-system-MINC.patch
+0002-Do-not-unconditionally-enable-SSE-for-i386.patch


=====================================
debian/rules
=====================================
@@ -9,17 +9,17 @@ SOVERSION = $(VER_MAJOR).$(VER_MINOR)
 #ITK is not properly using system provided headers
 export DEB_CPPFLAGS_MAINT_APPEND = -I/usr/include/nifti -g1
 
+ENABLE_FFTW=ON
+ENABLE_UNSIGNED_LONG_LONG=ON
 
 ifeq ($(DEB_HOST_ARCH),i386)
   ENABLE_FFTW=OFF
 #(unsigned long) == (unsigned int) on 32 bit, since itk 4.10 or g++-5.4
   ENABLE_UNSIGNED_LONG_LONG=OFF
+  DEB_CMAKEFLAGS_MAINT_APPEND = -DITK_COMPUTER_MEMORY_SIZE=2
   # Tests are permanently failing, try force rounding to normal double
   # accuracy
   export DEB_CXXFLAGS_MAINT_APPEND=-ffloat-store
-else
-  ENABLE_FFTW=ON
-  ENABLE_UNSIGNED_LONG_LONG=ON
 endif
 
 CMAKE_FLAGS = \
@@ -40,7 +40,7 @@ CMAKE_FLAGS = \
 	-DITK_USE_SYSTEM_FFTW:BOOL=$(ENABLE_FFTW) \
 	-DITK_USE_SYSTEM_GDCM:BOOL=ON \
 	-DITK_USE_SYSTEM_GOOGLETEST:BOOL=ON \
-        -DGTEST_SRC=/usr/src/googletest/googletest \
+  -DGTEST_SRC=/usr/src/googletest/googletest \
 	-DITK_USE_SYSTEM_MINC:BOOL=ON \
 	-DITK_USE_SYSTEM_HDF5:BOOL=ON \
 	-DITK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -52,7 +52,7 @@ CMAKE_FLAGS = \
 	-DModule_ITKDCMTK:BOOL=ON \
 	-DModule_ITKIOPhilipsREC:BOOL=OFF \
 	-DModule_ITKLevelSetsv4Visualization:BOOL=OFF \
-        -DModule_BridgeNumPy:BOOL=OFF \
+  -DModule_BridgeNumPy:BOOL=OFF \
 	-DModule_ITKVideoBridgeOpenCV:BOOL=OFF \
 	-DModule_ITKVideoBridgeVXL:BOOL=OFF \
 	-DModule_ITKVtkGlue:BOOL=OFF \
@@ -62,9 +62,10 @@ CMAKE_FLAGS = \
 	-DITK_WRAP_IMAGE_DIMS="2;3" \
 	-DITK_WRAP_unsigned_long_long:BOOL=$(ENABLE_UNSIGNED_LONG_LONG) \
 	-DITK_WRAP_double:BOOL=ON \
-        -DITK_WRAP_vector_double:BOOL=ON \
-        -DITK_WRAP_covariant_vector_double:BOOL=ON \
-        -DITK_WRAP_complex_double:BOOL=ON
+  -DITK_WRAP_vector_double:BOOL=ON \
+  -DITK_WRAP_covariant_vector_double:BOOL=ON \
+  -DITK_WRAP_complex_double:BOOL=ON \
+  $(DEB_CMAKEFLAGS_MAINT_APPEND)
 
 pkg_lib = libinsighttoolkit$(SOVERSION)
 pkg_dev = libinsighttoolkit$(VER_MAJOR)-dev



View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/compare/29251710c6d15a74689d0759feecd79b8395a734...b6446c2c9f6b332100f55fed5dc9b9003053b598

-- 
View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/compare/29251710c6d15a74689d0759feecd79b8395a734...b6446c2c9f6b332100f55fed5dc9b9003053b598
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211213/80494b3f/attachment-0001.htm>