Skip to content

Commit

Permalink
Merge pull request #35 from lrineau/cgal-5.5.3
Browse files Browse the repository at this point in the history
update v5.5.3
  • Loading branch information
lrineau authored Aug 9, 2023
2 parents 9d06c9c + 73b9e4a commit 18278fa
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
{% set version = "5.5.2" %}
{% set version = "5.5.3" %}

package:
name: cgal-cpp
version: {{ version }}

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
Expand Down
24 changes: 24 additions & 0 deletions recipe/pr7635.patch
Original file line number Diff line number Diff line change
@@ -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 <CGAL/Quotient.h>

0 comments on commit 18278fa

Please sign in to comment.