Author: smr Date: 2015-07-05 05:52:50 +0000 (Sun, 05 Jul 2015) New Revision: 19515
Added: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/vcl-dunno-about-this-gcc.patch Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series Log: Add patch for GCC 5 build. Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog =================================================================== --- trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog 2015-07-05 04:55:34 UTC (rev 19514) +++ trunk/packages/insighttoolkit/branches/3.20.1/debian/changelog 2015-07-05 05:52:50 UTC (rev 19515) @@ -1,3 +1,10 @@ +insighttoolkit (3.20.1+git20120521-6) unstable; urgency=medium + + * patches/vcl-dunno-about-this-gcc.patch: New. Upstream patch to build + VCL with GCC 5. Closes: #777912. + + -- Steve M. Robbins <[email protected]> Sun, 05 Jul 2015 00:41:27 -0500 + insighttoolkit (3.20.1+git20120521-5) unstable; urgency=low * Team upload Modified: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series =================================================================== --- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series 2015-07-05 04:55:34 UTC (rev 19514) +++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/series 2015-07-05 05:52:50 UTC (rev 19515) @@ -16,3 +16,4 @@ nan-i386.patch #tiff5.patch snan-sanity.patch +vcl-dunno-about-this-gcc.patch Added: trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/vcl-dunno-about-this-gcc.patch =================================================================== --- trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/vcl-dunno-about-this-gcc.patch (rev 0) +++ trunk/packages/insighttoolkit/branches/3.20.1/debian/patches/vcl-dunno-about-this-gcc.patch 2015-07-05 05:52:50 UTC (rev 19515) @@ -0,0 +1,54 @@ +From: Alexander Hewer <[email protected]> +Date: Tue, 5 May 2015 08:45:33 +0000 (+0200) +Subject: COMP: fixed error "Dunno about this gcc" for gcc 5.1 +X-Git-Tag: v4.8rc01~104^2 +X-Git-Url: http://itk.org/gitweb?p=ITK.git;a=commitdiff_plain;h=7f54e864;hp=8d58556089399c11d51795d46d6b17c355af95dc + +COMP: fixed error "Dunno about this gcc" for gcc 5.1 + +Change-Id: I52f692b3e3e1aa01327cb6e184541526d2c824df +--- + +--- insighttoolkit-3.20.1+git20120521.orig/Utilities/vxl/vcl/tests/test_preprocessor.cxx ++++ insighttoolkit-3.20.1+git20120521/Utilities/vxl/vcl/tests/test_preprocessor.cxx +@@ -101,6 +101,15 @@ + ++minor_count; + #endif + ++#ifdef VCL_GCC_5 ++ ++major_count; ++#endif ++#ifdef VCL_GCC_50 ++ ++minor_count; ++#endif ++#ifdef VCL_GCC_51 ++ ++minor_count; ++#endif + + #ifdef VCL_VC + ++compiler_count; +--- insighttoolkit-3.20.1+git20120521.orig/Utilities/vxl/vcl/vcl_compiler.h ++++ insighttoolkit-3.20.1+git20120521/Utilities/vxl/vcl/vcl_compiler.h +@@ -119,6 +119,13 @@ + # else + # define VCL_GCC_40 + # endif ++# elif (__GNUC__==5) ++# define VCL_GCC_5 ++# if (__GNUC_MINOR__ > 0 ) ++# define VCL_GCC_51 ++# else ++# define VCL_GCC_50 ++# endif + # else + # error "Dunno about this gcc" + # endif +@@ -225,7 +232,7 @@ + + // This *needs* to come after vcl_config_headers.h + #if defined(__GNUC__) && !defined(__INTEL_COMPILER) +-# if defined(VCL_GCC_3) || defined(VCL_GCC_4) ++# if defined(VCL_GCC_3) || defined(VCL_GCC_4) || defined(VCL_GCC_5) + # define GNU_LIBSTDCXX_V3 1 + # elif !defined(GNU_LIBSTDCXX_V3) && defined(VCL_GCC_295) && VCL_CXX_HAS_HEADER_ISTREAM + // One difference between v2 and v3 is that the former has _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
