Re: ITK 4.1 patches for gcc 4.7
On Wed, 2012-06-13 at 09:11 -0400, Paul Novotny wrote:
> > > Hopefully these fix some of the errors on the other architectures,
> > > although I think i386 has more failures.
> >
> > Yes, it does: http://open.cdash.org/viewTest.php?onlyfailed&buildid=2355571
> >
> > Also note that the build with gcc 4.6 is failing on most architectures:
> > https://buildd.debian.org/status/package.php?p=insighttoolkit4&suite=experimental
> >
> > Help with this would be highly valued.
>
> I'll try and build i386 sometime soon to see if I can find anything.
Here is a patch that fixes almost all of the test failures on i386, it
turned out to be one bug in NrrdIO.
The only thing left on i386 are the old fftw problems we saw before.
-Paul
Description: Fix test failures due to NrrdIO on i386
Fix a bunch of failing tests, all because NrrdIO was doing some run time
checks on NaN. The run-time check is already skipped on Apple builds and
with Visual Studio. So now we add GCC version >= 4.7
Author: Paul Novotny <paul@paulnovo.us>
--- debian-svn.orig/Modules/ThirdParty/NrrdIO/src/NrrdIO/sane.c
+++ debian-svn/Modules/ThirdParty/NrrdIO/src/NrrdIO/sane.c
@@ -107,9 +107,11 @@
1) APPLE builds due to a cross-compilation problem, and
2) Visual Studio builds for version newer than 2005 (not included)
- when building in 32bits. */
+ when building in 32bits.
+ 3) GCC 4.7 Builds when building in 32bits */
-#if defined(__APPLE__) || ( defined(_MSC_VER) && _MSC_VER >= 1400 )
+#if defined(__APPLE__) || ( defined(_MSC_VER) && _MSC_VER >= 1400 ) || \
+ ( defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 )))
/* don't compare airFP_SNAN */
#else
&& airFP_SNAN == airFPClass_f(AIR_SNAN)
Reply to: