Ticket #9808: numpy-spkg-install.diff

File numpy-spkg-install.diff, 1.8 KB (added by maldun, 11 years ago)

Changes of the spkg-install from the upgrade to 1.3.x to 1.5.0 (changes that were applied to 1.4.1 are also contained)

Line 
15,6c5,6
2< if [ -z "$SAGE_LOCAL" ]; then
3<    echo "SAGE_LOCAL undefined ... exiting"
4---
5> if [ "$SAGE_LOCAL" = "" ]; then
6>    echo "SAGE_LOCAL undefined ... exiting";
711,21c11,18
8< # Setting CFLAGS to have the option -m64 does not work for Numpy when
9< # making 64-bit builds on at least OS X and Solaris. Instead set CC
10< # to include the the -m64
11<
12< if [ -z "$CFLAG64" ] ; then
13<    CFLAG64=-m64
14< fi
15<
16< if [ "x$SAGE64" = xyes ] ; then
17<    CC="$CC $CFLAG64"
18<    export CC
19---
20> # numpy's distutils is buggy and runs a conftest without
21> # taking CFLAGS into account. With 64 bit OSX this results
22> # in *boom*
23> if [ `uname` = "Darwin" -a "$SAGE64" = "yes" ]; then
24>    echo "64 bit MacIntel: copying fake gcc"
25>    rm $SAGE_LOCAL/bin/gcc
26>    cp gcc_fake $SAGE_LOCAL/bin/gcc
27>    chmod 755 $SAGE_LOCAL/bin/gcc
2826a24,26
29>
30>     echo "CYGWIN: Patching src/numpy/core/setup.py"
31>     cp patches/cygwin-core-setup.py src/numpy/core/setup.py
3235a36
33>
3440,42d40
35<     export FC="sage_fortran"
36< else
37<     export LDFLAGS="${LDFLAGS} -shared"
3844,45d41
39< export FC="${SAGE_LOCAL}/bin/sage_fortran"
40< export NUMPY_FCONFIG="config_fc --noopt --noarch"
4149,51c45,46
42< #This patch should eliminate the segfault errors in
43< #the real_roots.pyx file of sage.rings.polynomial
44< cp ../patches/buffer.c numpy/core/src/multiarray/buffer.c
45---
46> cp ../patches/gnu.py numpy/distutils/fcompiler/gnu.py
47> cp ../patches/__init__.py  numpy/distutils/fcompiler/__init__.py
4858c53
49< python setup.py install ${NUMPY_FCONFIG}
50---
51> python setup.py install
5264a60,67
53> if [ `uname` = "Darwin" -a "$SAGE64" = "yes" ]; then
54>    echo "64 bit MacIntel: deleting fake gcc"
55>    rm $SAGE_LOCAL/bin/gcc
56> fi
57>
58> #echo "Checking the numpy.pxi file in the Sage source tree..."
59> #$CUR/bin/update-pxi.py $CUR/src/numpy/doc/cython/numpy.pxi $SAGE_ROOT/devel/sage/sage/ext/numpy.pxi
60>