diff --git a/SPKG.txt b/SPKG.txt
a
|
b
|
|
53 | 53 | |
54 | 54 | == Changelog == |
55 | 55 | |
| 56 | === cvxopt-1.1.5.p1 (Volker Braun, 13 Sept 2012) === |
| 57 | * Fix BLAS_LIB_DIR on OSX |
| 58 | |
56 | 59 | === cvxopt-1.1.5 (François Bissey, 25 June 2012) === |
57 | 60 | * update to 1.1.5, drop dense.c patch as it is not needed anymore. |
58 | 61 | * rewrite and simplify the patch for setup.py. Keep the necessary linking minimal. |
diff --git a/patches/setup.py.patch b/patches/setup.py.patch
a
|
b
|
|
1 | | --- src/src/setup.py.orig 2012-06-25 22:04:22.846029845 +1200 |
2 | | +++ src/src/setup.py 2012-06-25 22:02:20.505936660 +1200 |
3 | | @@ -2,29 +2,39 @@ |
| 1 | --- old/src/setup.py 2012-03-27 21:05:13.000000000 +0100 |
| 2 | +++ src/src/setup.py 2012-09-13 15:15:48.939413321 +0100 |
| 3 | @@ -2,26 +2,38 @@ |
4 | 4 | from glob import glob |
5 | 5 | |
6 | 6 | # Modifiy this if BLAS and LAPACK libraries are not in /usr/lib. |
… |
… |
|
9 | 9 | +import os |
10 | 10 | +SAGE_LIB = os.environ['SAGE_LOCAL']+'/lib' |
11 | 11 | +SAGE_INCLUDE = os.environ['SAGE_LOCAL']+'/include' |
12 | | +BLAS_LIB_DIR = SAGE_LIB |
13 | 12 | |
14 | 13 | # Default names of BLAS and LAPACK libraries |
15 | 14 | -BLAS_LIB = ['blas'] |
… |
… |
|
17 | 16 | BLAS_EXTRA_LINK_ARGS = [] |
18 | 17 | |
19 | 18 | +if os.environ['UNAME'] == 'CYGWIN': |
20 | | + BLAS_LIB =['blas', 'gfortran'] |
| 19 | + BLAS_LIB =['blas', 'gfortran'] |
| 20 | + BLAS_LIB_DIR = '/usr/lib' |
21 | 21 | +elif os.environ['UNAME'] == 'Darwin': |
22 | | + BLAS_LIB =['blas','gfortran','m'] |
| 22 | + BLAS_LIB =['blas','gfortran','m'] |
| 23 | + BLAS_LIB_DIR = '/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/' |
23 | 24 | +else: |
24 | | + BLAS_LIB =['f77blas','cblas','gfortran','atlas','m'] |
| 25 | + BLAS_LIB =['f77blas','cblas','gfortran','atlas','m'] |
| 26 | + BLAS_LIB_DIR = SAGE_LIB |
25 | 27 | + |
26 | 28 | # Set environment variable BLAS_NOUNDERSCORES=1 if your BLAS/LAPACK do |
27 | 29 | # not use trailing underscores |
… |
… |
|
41 | 43 | +GSL_INC_DIR = SAGE_INCLUDE |
42 | 44 | |
43 | 45 | # Set to 1 if you are installing the fftw module. |
44 | | -BUILD_FFTW = 0 |
45 | | +BUILD_FFTW = 0 |
46 | | |
47 | | # Directory containing libfftw3 (used only when BUILD_FFTW = 1). |
48 | | FFTW_LIB_DIR = '/usr/lib' |
49 | | @@ -33,13 +43,13 @@ |
| 46 | BUILD_FFTW = 0 |
| 47 | @@ -33,13 +45,13 @@ |
50 | 48 | FFTW_INC_DIR = '/usr/include' |
51 | 49 | |
52 | 50 | # Set to 1 if you are installing the glpk module. |