Skip to content

Commit

Permalink
Trac #33080: Fix scipy-1.7.2 build failure on Cygwin
Browse files Browse the repository at this point in the history
Sage 9.5.beta9 + #33043 fails to build scipy-1.7.2
on Cygwin.

Initial report:
- [https://groups.google.com/g/sage-release/c/V9KflJYxHrk/m/gJIZHkegDQAJ
sage-release, 2021-12]

Issues/PRs:
- boostorg/math#727 - add Cygwin CI
- boostorg/math#728 -
boost_math_tools_config.patch
- scipy/scipy#15296 - !SciPy 1.7.x build
failure on Cygwin

URL: https://trac.sagemath.org/33080
Reported by: slelievre
Ticket author(s): Matthias Koeppe
Reviewer(s): Samuel Lelièvre
  • Loading branch information
Release Manager committed Dec 31, 2021
2 parents 3bd8aed + 9070a03 commit 52f8223
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build/pkgs/configure/checksums.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=configure-VERSION.tar.gz
sha1=c637f95c41bd63480f93249487e6ceda2ed6ff06
md5=79ec35606bdb48b6dc01c7b3a204b7fd
cksum=1772444647
sha1=ddc95e8bbd9b0a04576bf0040cb6e9a3743a7025
md5=b6062b6b285211a65a7b005eac230ff4
cksum=3715468583
2 changes: 1 addition & 1 deletion build/pkgs/configure/package-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9347ab0d79d19b615a7e4035b59efb2b20876933
3e2eba8dba557a9626a3c465206b89776f3ebeac
11 changes: 11 additions & 0 deletions build/pkgs/scipy/patches/boost_math_tools_config.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/scipy/_lib/boost/boost/math/tools/config.hpp 2021-11-01 02:28:55 UTC
+++ b/scipy/_lib/boost/boost/math/tools/config.hpp
@@ -28,7 +28,7 @@

#include <boost/math/tools/user.hpp>

-#if (defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__EMSCRIPTEN__)\
+#if (defined(__NetBSD__) || defined(__EMSCRIPTEN__)\
|| (defined(__hppa) && !defined(__OpenBSD__)) || (defined(__NO_LONG_DOUBLE_MATH) && (DBL_MANT_DIG != LDBL_MANT_DIG))) \
&& !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
# define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS

0 comments on commit 52f8223

Please sign in to comment.