# HG changeset patch # User Sebastien Jodogne # Date 1536066460 -7200 # Node ID 4fdb25c5df9c31539662d5ad7418a0ed919eed0f # Parent e02af4ca8003b1b5a80071a4b7c83ec6f1af23d7 Fix issue #98 (DCMTK configuration fails with GCC 6.4.0 on Alpine) diff -r e02af4ca8003 -r 4fdb25c5df9c NEWS --- a/NEWS Tue Sep 04 10:10:22 2018 +0200 +++ b/NEWS Tue Sep 04 15:07:40 2018 +0200 @@ -29,6 +29,7 @@ * Fix HTTPS requests to sites using a certificate encrypted with ECDSA * Fix handling of incoming C-FIND queries containing Generic Group Length (*, 0x0000) * Fix issue 54 (quoting multipart answers), for OsiriX compatibility through DICOMweb +* Fix issue 98 (DCMTK configuration fails with GCC 6.4.0 on Alpine) Version 1.4.1 (2018-07-17) diff -r e02af4ca8003 -r 4fdb25c5df9c Resources/Patches/dcmtk-3.6.2-cmath.patch --- a/Resources/Patches/dcmtk-3.6.2-cmath.patch Tue Sep 04 10:10:22 2018 +0200 +++ b/Resources/Patches/dcmtk-3.6.2-cmath.patch Tue Sep 04 15:07:40 2018 +0200 @@ -1,17 +1,19 @@ diff -urEb dcmtk-3.6.2.orig/CMake/GenerateDCMTKConfigure.cmake dcmtk-3.6.2/CMake/GenerateDCMTKConfigure.cmake ---- dcmtk-3.6.2.orig/CMake/GenerateDCMTKConfigure.cmake 2018-03-24 11:19:13.705396611 +0100 -+++ dcmtk-3.6.2/CMake/GenerateDCMTKConfigure.cmake 2018-03-24 11:19:33.429286501 +0100 -@@ -571,9 +571,9 @@ - CHECK_FUNCTIONWITHHEADER_EXISTS(isinf "${HEADERS}" HAVE_PROTOTYPE_ISINF) - CHECK_FUNCTIONWITHHEADER_EXISTS(isnan "${HEADERS}" HAVE_PROTOTYPE_ISNAN) +--- dcmtk-3.6.2.orig/CMake/GenerateDCMTKConfigure.cmake 2018-08-08 13:04:10.225822539 +0100 ++++ dcmtk-3.6.2/CMake/GenerateDCMTKConfigure.cmake 2018-08-08 13:47:28.668150738 +0100 +@@ -568,11 +568,11 @@ + ENDIF(HAVE_CSTDDEF) + + CHECK_FUNCTIONWITHHEADER_EXISTS(feenableexcept "${HEADERS}" HAVE_PROTOTYPE_FEENABLEEXCEPT) +- CHECK_FUNCTIONWITHHEADER_EXISTS(isinf "${HEADERS}" HAVE_PROTOTYPE_ISINF) +- CHECK_FUNCTIONWITHHEADER_EXISTS(isnan "${HEADERS}" HAVE_PROTOTYPE_ISNAN) ++ CHECK_FUNCTIONWITHHEADER_EXISTS("isinf(0.)" "${HEADERS}" HAVE_PROTOTYPE_ISINF) ++ CHECK_FUNCTIONWITHHEADER_EXISTS("isnan(0.)" "${HEADERS}" HAVE_PROTOTYPE_ISNAN) CHECK_FUNCTIONWITHHEADER_EXISTS(finite "${HEADERS}" HAVE_PROTOTYPE_FINITE) - CHECK_FUNCTIONWITHHEADER_EXISTS(std::isinf "${HEADERS}" HAVE_PROTOTYPE_STD__ISINF) - CHECK_FUNCTIONWITHHEADER_EXISTS(std::isnan "${HEADERS}" HAVE_PROTOTYPE_STD__ISNAN) -- CHECK_FUNCTIONWITHHEADER_EXISTS(std::finite "${HEADERS}" HAVE_PROTOTYPE_STD__FINITE) -+ CHECK_FUNCTIONWITHHEADER_EXISTS(std::isinf "${HEADERS}" HAVE_PROTOTYPE_STD__ISINF) -+ CHECK_FUNCTIONWITHHEADER_EXISTS(std::isnan "${HEADERS}" HAVE_PROTOTYPE_STD__ISNAN) -+ CHECK_FUNCTIONWITHHEADER_EXISTS(std::finite "${HEADERS}" HAVE_PROTOTYPE_STD__FINITE) ++ CHECK_FUNCTIONWITHHEADER_EXISTS("std::isinf(0.)" "${HEADERS}" HAVE_PROTOTYPE_STD__ISINF) ++ CHECK_FUNCTIONWITHHEADER_EXISTS("std::isnan(0.)" "${HEADERS}" HAVE_PROTOTYPE_STD__ISNAN) + CHECK_FUNCTIONWITHHEADER_EXISTS(std::finite "${HEADERS}" HAVE_PROTOTYPE_STD__FINITE) CHECK_FUNCTIONWITHHEADER_EXISTS(flock "${HEADERS}" HAVE_PROTOTYPE_FLOCK) CHECK_FUNCTIONWITHHEADER_EXISTS(gethostbyname "${HEADERS}" HAVE_PROTOTYPE_GETHOSTBYNAME) - CHECK_FUNCTIONWITHHEADER_EXISTS(gethostbyname_r "${HEADERS}" HAVE_PROTOTYPE_GETHOSTBYNAME_R) -Only in dcmtk-3.6.2/CMake: GenerateDCMTKConfigure.cmake~