Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit 3ac4f4a

Browse files
author
Release Manager
committed
Trac #30643: cygwin-minimal, cygwin-standard: scipy build fails: 'u_int' has not been declared
https://github.com/mkoeppe/sage/runs/1153050152 {{{ In file included from /usr/include/sys/config.h:5, from /usr/include/_ansi.h:11, from /usr/include/sys/reent.h:13, from /usr/include/math.h:5, from /usr/lib/gcc/x86_64-pc- cygwin/10/include/c++/cmath:45, from scipy/spatial/ckdtree/src/query.cxx:1: /usr/include/sys/features.h:255: note: this is the location of the previous definition 255 | #define __BSD_VISIBLE 0 | In file included from /cygdrive/d/a/sage/sage/local/include/python3.8/pyport.h:219, from /cygdrive/d/a/sage/sage/local/include/python3.8/Python.h:63, from /cygdrive/d/a/sage/sage/local/lib/python3.8 /site-packages/numpy/core/include/numpy/npy_common.h:11, from scipy/spatial/ckdtree/src/ckdtree_decl.h:10, from scipy/spatial/ckdtree/src/query.cxx:13: /usr/include/sys/time.h:106:34: error: 'u_int' has not been declared 106 | bintime_mul(struct bintime *_bt, u_int _x) | ^~~~~ g++: scipy/spatial/ckdtree/src/build.cxx }}} Also seen in `cygwin-standard` (https://github.com/sagemath/sage/runs/1190880811) Blocker for 9.2 because it is a regression in platform support URL: https://trac.sagemath.org/30643 Reported by: mkoeppe Ticket author(s): Matthias Koeppe Reviewer(s): Erik Bray
2 parents dc3fc00 + 454308f commit 3ac4f4a

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

build/pkgs/numpy/spkg-install.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ else
1111
export LDFLAGS="${LDFLAGS} -shared"
1212
fi
1313

14+
if [ "$UNAME" = "CYGWIN" ]; then
15+
# Trac #30643
16+
export CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
17+
fi
18+
1419
sage-python23 ../lapack_conf.py
1520

1621
# Make sure that the fortran objects are compiled with -fPIC

build/pkgs/scipy/spkg-install.in

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ fi
1818
# Make sure that the fortran objects are compiled with -fPIC
1919
export FFLAGS="$FFLAGS -fPIC"
2020
export FCFLAGS="$FCFLAGS -fPIC"
21+
22+
if [ "$UNAME" = "CYGWIN" ]; then
23+
# Trac #30643
24+
export CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
25+
fi
26+
2127
if [ "$UNAME" = "CYGWIN" -a "$SAGE_DEBUG" = "yes" ]; then
2228
# Needed for just one or two modules when compiling in debug mode
2329
# Otherwise the debug symbols create too many sections in the binary

0 commit comments

Comments
 (0)