Gert Wollny pushed to branch master at Debian Med / insighttoolkit
Commits: 910c9d76 by Gert Wollny at 2019-11-13T18:26:53Z d/*: Make it compile with gcc-9, Closes: #944179 - - - - - 648635f3 by Gert Wollny at 2019-11-13T18:28:02Z d/changelog: Update for upload - - - - - ca13f18f by Gert Wollny at 2019-11-13T18:34:31Z d/p: Enable removing the gcc version test - - - - - 759dbb5e by Gert Wollny at 2019-11-14T08:56:47Z d/p/: make preprozessor test pass with all gcc - - - - - fbf96644 by Gert Wollny at 2019-11-14T14:02:31Z d/changelog: reset to UNRELEASED - - - - - 5 changed files: - debian/changelog - debian/control - debian/patches/remove_gcc_version_test.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,6 +1,7 @@ -insighttoolkit4 (4.13.2-dfsg1-2) unstable; urgency=medium +insighttoolkit4 (4.13.2-dfsg1-2) UNRELEASED; urgency=medium * d/control: Switch python package name to python3 + * d/*: Make it compile with gcc-9, Closes: #944179 -- Gert Wollny <[email protected]> Mon, 11 Nov 2019 19:23:04 +0100 ===================================== debian/control ===================================== @@ -8,8 +8,7 @@ Uploaders: Steve M. Robbins <[email protected]>, Build-Depends: debhelper (>= 9), cmake (>= 2.8.9), swig3.0, - castxml (>= 0.1+git20160202-1.1), - g++-8, + castxml (>= 0.2-3), zlib1g-dev (>= 1.2.2), libdouble-conversion-dev, libexpat-dev, ===================================== debian/patches/remove_gcc_version_test.patch ===================================== @@ -65,3 +65,17 @@ #endif #if defined(_WIN32) || defined(WIN32) +--- a/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx ++++ b/Modules/ThirdParty/VNL/src/vxl/vcl/tests/test_preprocessor.cxx +@@ -64,6 +64,11 @@ + ++minor_count; + #endif + ++#ifdef VCL_GCC_73 ++ ++compiler_count; ++ ++minor_count; ++#endif ++ + #ifdef VCL_VC + ++compiler_count; + #endif ===================================== debian/patches/series ===================================== @@ -8,3 +8,4 @@ itk4.12.0-resource_cprobe.patch disable-doxygen.patch simplify-system-gtest.patch fix-minc-includes.patch +remove_gcc_version_test.patch ===================================== debian/rules ===================================== @@ -87,7 +87,7 @@ pkg_python = insighttoolkit$(VER_MAJOR)-python3 override_dh_auto_configure-indep: override_dh_auto_configure-arch: pre-build - CXX=g++-8 dh_auto_configure -- $(CMAKE_FLAGS) + dh_auto_configure -- $(CMAKE_FLAGS) override_dh_auto_build-indep: View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/compare/474b2cf479fe038a345d106868bdcc417fb19af3...fbf966441c1dc3bc08765a98bd4a1319921524f5 -- View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/compare/474b2cf479fe038a345d106868bdcc417fb19af3...fbf966441c1dc3bc08765a98bd4a1319921524f5 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
