Ticket #10508: cvxopt-1.1.5.p1.diff

SPKG.txt

@@ -53 +53 @@
 
 == Changelog ==
 
+=== cvxopt-1.1.5.p1 (Volker Braun, 13 Sept 2012) ===
+ * Fix BLAS_LIB_DIR on OSX
+
 === cvxopt-1.1.5 (François Bissey, 25 June 2012) ===
  * update to 1.1.5, drop dense.c patch as it is not needed anymore.
  * rewrite and simplify the patch for setup.py. Keep the necessary linking minimal.

patches/setup.py.patch

@@ -1 @@
---- src/src/setup.py.orig       2012-06-25 22:04:22.846029845 +1200
-+++ src/src/setup.py    2012-06-25 22:02:20.505936660 +1200
-@@ -2,29 +2,39 @@
+--- old/src/setup.py    2012-03-27 21:05:13.000000000 +0100
++++ src/src/setup.py    2012-09-13 15:15:48.939413321 +0100
+@@ -2,26 +2,38 @@
  from glob import glob
  
  # Modifiy this if BLAS and LAPACK libraries are not in /usr/lib.
@@ -9 +9 @@
 +import os
 +SAGE_LIB = os.environ['SAGE_LOCAL']+'/lib'
 +SAGE_INCLUDE = os.environ['SAGE_LOCAL']+'/include'
-+BLAS_LIB_DIR = SAGE_LIB
  
  # Default names of BLAS and LAPACK libraries
 -BLAS_LIB = ['blas']
@@ -17 +16 @@
  BLAS_EXTRA_LINK_ARGS = []
  
 +if os.environ['UNAME'] == 'CYGWIN':
-+  BLAS_LIB =['blas', 'gfortran']
++    BLAS_LIB =['blas', 'gfortran']
++    BLAS_LIB_DIR = '/usr/lib'
 +elif os.environ['UNAME'] == 'Darwin':
-+  BLAS_LIB =['blas','gfortran','m']
++    BLAS_LIB =['blas','gfortran','m']
++    BLAS_LIB_DIR = '/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/'
 +else:
-+  BLAS_LIB =['f77blas','cblas','gfortran','atlas','m']
++    BLAS_LIB =['f77blas','cblas','gfortran','atlas','m']
++    BLAS_LIB_DIR = SAGE_LIB
 +
  # Set environment variable BLAS_NOUNDERSCORES=1 if your BLAS/LAPACK do
  # not use trailing underscores
@@ -41 +43 @@
 +GSL_INC_DIR = SAGE_INCLUDE
  
  # Set to 1 if you are installing the fftw module.
--BUILD_FFTW = 0 
-+BUILD_FFTW = 0
- 
- # Directory containing libfftw3 (used only when BUILD_FFTW = 1).
- FFTW_LIB_DIR = '/usr/lib'
-@@ -33,13 +43,13 @@
+ BUILD_FFTW = 0 
+@@ -33,13 +45,13 @@
  FFTW_INC_DIR = '/usr/include'
  
  # Set to 1 if you are installing the glpk module.