Ticket #11886: scipy-0.9.p0-p1.diff

File scipy-0.9.p0-p1.diff, 3.8 KB (added by leif, 11 years ago)

Diff between John's p0 and my p1. For reference / review.

  • .hgtags

    diff --git a/.hgtags b/.hgtags
    a b  
    222aa048110070b81feee35a78471def2c5bed2801 scipy-0.7.p1
    33a5fb4ead3bf9698fa19114916a9491f774994d14 scipy-0.8
    44cf97abbde76fcd10340bd35d418edc666e747105 scipy-0.9
     553edccc45191dd85202b092dd2dcd636e4755235 scipy-0.9.p1
  • SPKG.txt

    diff --git a/SPKG.txt b/SPKG.txt
    a b  
    2626 * Python, which in Sage has numerous dependencies
    2727 * Numpy
    2828 * Fortran
     29 * GNU patch
    2930
    3031== Special Update/Build Instructions ==
    31  * None
     32 * Make sure the patches still apply.
     33   The ones added in the scipy-0.9.p0 spkg (#11886) were all taken from
     34   (unstable) upstream, so can presumably be removed once we upgrade to
     35   a new stable version.
    3236
    3337== Changelog ==
    3438
    35 == scipy-0.9.p0 (John Palmieri, 30 Sept 2011) ==
     39=== scipy-0.9.p1 (Leif Leonhardy, November 1st 2011) ===
     40 * #11886: Reviewer changes (mostly cosmetic).
     41
     42=== scipy-0.9.p0 (John Palmieri, 30 Sept 2011) ===
    3643 * #11886: get scipy to build on OS X 10.7 Lion, using the patches from
    3744   https://github.com/scipy/scipy/commit/effa6f68f8ada57b79864852b609ff06d2527306
    3845
    39 == scipy-0.9 (F. Bissey; 16 March 2011) ===
     46=== scipy-0.9 (F. Bissey; 16 March 2011) ===
    4047 * updated the source to 0.9.0. No patches needed.
    4148
    42 == scipy-0.8 (S. Reiterer, F. Bissey, D. Kirkby, J. H. Palmieri; 14 October 2010) ===
     49=== scipy-0.8 (S. Reiterer, F. Bissey, D. Kirkby, J. H. Palmieri; 14 October 2010) ===
    4350 * #9808 Upgrade to scipy 0.8.
    4451 * Deleted outdated patches
    4552 * spkg install changed by F. Bissey, because g95 makes trouble on OS X.
  • spkg-install

    diff --git a/spkg-install b/spkg-install
    old mode 100644
    new mode 100755
    a b  
    11#!/usr/bin/env bash
    2 # These flags confuse numpy's distutils.   In particular,
     2
     3if [ -z "$SAGE_LOCAL" ]; then
     4    echo >&2 "Error: SAGE_LOCAL undefined - exiting..."
     5    echo >&2 "Maybe run 'sage -sh'?"
     6    exit 1
     7fi
     8
     9# These flags confuse numpy's distutils.  In particular,
    310# if they are set empty bad things happen.
     11unset CFLAGS CXXFLAGS SHAREDFLAGS
     12echo "Note: CFLAGS, CXXFLAGS and SHAREDFLAGS are taken from distutils,"
     13echo "      so their current settings are ignored."
    414
    5 unset CFLAGS CXXFLAGS SHAREDFLAGS
    6 
    7 if [ `uname` = "Darwin" ]; then
     15if [ "$UNAME" = "Darwin" ]; then
    816    unset ATLAS
    917    unset BLAS
    1018    unset LAPACK
     
    2331export F90="$SAGE_LOCAL/bin/sage_fortran"
    2432export F95="$SAGE_LOCAL/bin/sage_fortran"
    2533
    26 
    27 # This avoid problems on some systems -- until we officially
    28 # support umfpack (which we will likely do, since cvxopt
    29 # I think includes it).
    30 #   http://projects.scipy.org/pipermail/scipy-user/2006-July/008661.html
    31 # (Currently swig gets invoked by scipy when building the umfpack interace,
     34# This avoids problems on some systems -- until we officially
     35# support umfpack (which we will likely do, since cvxopt I think includes it):
     36UMFPACK="None"; export UMFPACK
     37# See http://projects.scipy.org/pipermail/scipy-user/2006-July/008661.html
     38# (Currently SWIG gets invoked by scipy when building the umfpack interface,
    3239# which is bad.)
    3340
    34 UMFPACK="None"; export UMFPACK
     41
     42# Remove previous installation (if any):
    3543rm -rf "$SAGE_LOCAL"/lib/python/site-packages/scipy
    3644
    3745cd src/
    3846
     47# Apply patches (if any):
    3948for patch in ../patches/*.patch; do
    4049    patch -p1 <"$patch"
    4150    if [ $? -ne 0 ]; then
    42         echo >&2 "Error applying '$patch'"
     51        echo >&2 "Error applying '$patch'."
    4352        exit 1
    4453    fi
    4554done
    4655
     56# Build:
     57python setup.py build
    4758if [ $? -ne 0 ]; then
    48     echo "Error patching setup.py"
    49     exit 1
    50 fi
    51 
    52 # Build
    53 python setup.py build
    54 if [ $? -ne 0 ]; then
    55     echo "Error building scipy."
     59    echo >&2 "Error building scipy."
    5660    exit 1
    5761fi
    5862
    59 # Intall
    60 python setup.py install 
     63# Install:
     64python setup.py install
    6165if [ $? -ne 0 ]; then
    62     echo "Error installing scipy."
     66    echo >&2 "Error installing scipy."
    6367    exit 1
    6468fi
    65