Author: smr Date: 2011-02-13 02:24:41 +0000 (Sun, 13 Feb 2011) New Revision: 5966
Added: trunk/packages/insighttoolkit/trunk/debian/patches/itkImageToImageFilterC.patch Modified: trunk/packages/insighttoolkit/trunk/debian/changelog trunk/packages/insighttoolkit/trunk/debian/patches/series trunk/packages/insighttoolkit/trunk/debian/rules Log: Include Gaetan's patch to split the wrappers into smaller modules. Modified: trunk/packages/insighttoolkit/trunk/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/changelog 2011-02-12 18:51:49 UTC (rev 5965) +++ trunk/packages/insighttoolkit/trunk/debian/changelog 2011-02-13 02:24:41 UTC (rev 5966) @@ -1,3 +1,13 @@ +insighttoolkit (3.20.0-7) unstable; urgency=low + + * patches/itkImageToImageFilterC.patch: New. Split the + ImageToImageFilter into smaller modules to avoid compiler table + overflow (build failure). + + * rules: Try parallel build again. + + -- Steve M. Robbins <[email protected]> Sat, 12 Feb 2011 20:04:44 -0600 + insighttoolkit (3.20.0-6) unstable; urgency=low [Paul Novotny] Added: trunk/packages/insighttoolkit/trunk/debian/patches/itkImageToImageFilterC.patch =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/itkImageToImageFilterC.patch (rev 0) +++ trunk/packages/insighttoolkit/trunk/debian/patches/itkImageToImageFilterC.patch 2011-02-13 02:24:41 UTC (rev 5966) @@ -0,0 +1,76 @@ +Description: Split ImageToImageFilterB into 2 smaller modules + to avoid compiler table overflow on certain architectures. + Without this patch, the powerpc build daemon fails with + "Error: operand out of range (0x0000000000008008 is not between 0xffffffffffff8000 and 0x0000000000007fff)" + See details and links in http://lists.debian.org/debian-devel/2011/02/msg00179.html +Author: Ga�tan Lehmann <[email protected]> +Origin: http://lists.debian.org/debian-devel/2011/02/msg00188.html + + +--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Modules/Base/CMakeLists.txt ++++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/CMakeLists.txt +@@ -24,6 +24,7 @@ + itkImageSource + itkImageToImageFilterA + itkImageToImageFilterB ++ itkImageToImageFilterC + itkInPlaceImageFilterA + itkInPlaceImageFilterB + itkFiniteDifferenceImageFilter +--- insighttoolkit-3.20.0.orig/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterB.cmake ++++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterB.cmake +@@ -27,27 +27,4 @@ + WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_VECTOR}" "${WRAP_ITK_SCALAR}") + WRAP_IMAGE_FILTER_COMBINATIONS("${WRAP_ITK_SCALAR}" "${WRAP_ITK_VECTOR}") + +- # complex <-> scalar +- IF(WRAP_complex_float AND WRAP_float) +- WRAP_IMAGE_FILTER_TYPES(CF F) +- WRAP_IMAGE_FILTER_TYPES(F CF) +- ENDIF(WRAP_complex_float AND WRAP_float) +- +- IF(WRAP_complex_double AND WRAP_double) +- WRAP_IMAGE_FILTER_TYPES(CD D) +- WRAP_IMAGE_FILTER_TYPES(D CD) +- ENDIF(WRAP_complex_double AND WRAP_double) +- +- # Wrap dim=3 -> dim=2, dim=3 -> dim=2, etc. +- FOREACH(d ${WRAP_ITK_DIMS}) +- FOREACH(d2 ${WRAP_ITK_DIMS}) +- IF (NOT "${d}" EQUAL "${d2}") # this was already taken care of elsewhere +- FOREACH(t ${WRAP_ITK_SCALAR}) +- WRAP_TEMPLATE("${ITKM_I${t}${d}}${ITKM_I${t}${d2}}" +- "${ITKT_I${t}${d}},${ITKT_I${t}${d2}}") +- ENDFOREACH(t) +- ENDIF(NOT "${d}" EQUAL "${d2}") +- ENDFOREACH(d2) +- ENDFOREACH(d) +- + END_WRAP_CLASS() +--- /dev/null ++++ insighttoolkit-3.20.0/Wrapping/WrapITK/Modules/Base/wrap_itkImageToImageFilterC.cmake +@@ -0,0 +1,24 @@ ++WRAP_CLASS("itk::ImageToImageFilter" POINTER) ++ # complex <-> scalar ++ IF(WRAP_complex_float AND WRAP_float) ++ WRAP_IMAGE_FILTER_TYPES(CF F) ++ WRAP_IMAGE_FILTER_TYPES(F CF) ++ ENDIF(WRAP_complex_float AND WRAP_float) ++ ++ IF(WRAP_complex_double AND WRAP_double) ++ WRAP_IMAGE_FILTER_TYPES(CD D) ++ WRAP_IMAGE_FILTER_TYPES(D CD) ++ ENDIF(WRAP_complex_double AND WRAP_double) ++ ++ # Wrap dim=3 -> dim=2, dim=3 -> dim=2, etc. ++ FOREACH(d ${WRAP_ITK_DIMS}) ++ FOREACH(d2 ${WRAP_ITK_DIMS}) ++ IF (NOT "${d}" EQUAL "${d2}") # this was already taken care of elsewhere ++ FOREACH(t ${WRAP_ITK_SCALAR}) ++ WRAP_TEMPLATE("${ITKM_I${t}${d}}${ITKM_I${t}${d2}}" ++ "${ITKT_I${t}${d}},${ITKT_I${t}${d2}}") ++ ENDFOREACH(t) ++ ENDIF(NOT "${d}" EQUAL "${d2}") ++ ENDFOREACH(d2) ++ ENDFOREACH(d) ++END_WRAP_CLASS() Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/patches/series 2011-02-12 18:51:49 UTC (rev 5965) +++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2011-02-13 02:24:41 UTC (rev 5966) @@ -7,3 +7,4 @@ wrapitk.patch wrapitk-externalprojects.patch add-registration-optimizers.patch +itkImageToImageFilterC.patch Modified: trunk/packages/insighttoolkit/trunk/debian/rules =================================================================== --- trunk/packages/insighttoolkit/trunk/debian/rules 2011-02-12 18:51:49 UTC (rev 5965) +++ trunk/packages/insighttoolkit/trunk/debian/rules 2011-02-13 02:24:41 UTC (rev 5966) @@ -2,7 +2,7 @@ # If set, honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment # out to never build in parallel, regardless of DEB_BUILD_OPTIONS. -#DEB_BUILD_PARALLEL = true +DEB_BUILD_PARALLEL = true # Using install/fast bypasses the install->all dependency, # avoiding a complete rebuild by "make install".
_______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
