diff --git a/.gitignore b/.gitignore index c89ecb7..618f9a0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.pyc build_artifacts +.vscode diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 662aceb..2bed1e0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "5.5.2" %} +{% set version = "5.5.3" %} package: name: cgal-cpp @@ -6,7 +6,10 @@ package: source: url: https://github.com/CGAL/cgal/releases/download/v{{ version }}/CGAL-{{ version }}.tar.xz - sha256: b2b05d5616ecc69facdc24417cce0b04fb4321491d107db45103add520e3d8c3 + sha256: 0a04f662693256328b05babfabb5e3a5b7db2f5a58d52e3c520df9d0828ddd73 + patches: + - pr7635.patch + # upstream patch from https://github.com/CGAL/cgal/pull/7635 build: number: 0 diff --git a/recipe/pr7635.patch b/recipe/pr7635.patch new file mode 100644 index 0000000..fcb26a6 --- /dev/null +++ b/recipe/pr7635.patch @@ -0,0 +1,24 @@ +diff --git a/Number_types/include/CGAL/boost_mp.h b/Number_types/include/CGAL/boost_mp.h +index 3dcaadcad21..b98980acbc5 100644 +--- a/Number_types/include/CGAL/boost_mp.h ++++ b/Number_types/include/CGAL/boost_mp.h +@@ -20,8 +20,18 @@ + // easy solution. + // MSVC had trouble with versions <= 1.69: + // https://github.com/boostorg/multiprecision/issues/98 ++// ++// Disable also on Windows 32 bits ++// because CGAL/cpp_float.h assumes _BitScanForward64 is available ++// See https://learn.microsoft.com/en-us/cpp/intrinsics/bitscanforward-bitscanforward64 ++// ++// Disable also with PowerPC processors, with Boost<1.80 because of that bug: ++// https://github.com/boostorg/multiprecision/pull/421 ++// + #if !defined CGAL_DO_NOT_USE_BOOST_MP && \ +- (!defined _MSC_VER || BOOST_VERSION >= 107000) ++ (!defined _MSC_VER || BOOST_VERSION >= 107000) && \ ++ (!defined _WIN32 || defined _WIN64) && \ ++ (BOOST_VERSION >= 108000 || (!defined _ARCH_PPC && !defined _ARCH_PPC64)) + #define CGAL_USE_BOOST_MP 1 + + #include