Ticket #10508: cvxopt-1.1.5.p1.diff

File cvxopt-1.1.5.p1.diff, 2.2 KB (added by jpflori, 8 years ago)

Rebased spkg diff, for review only.

  • SPKG.txt

    diff --git a/SPKG.txt b/SPKG.txt
    a b  
    5353
    5454== Changelog ==
    5555
     56=== cvxopt-1.1.5.p1 (Volker Braun, 13 Sept 2012) ===
     57 * Fix BLAS_LIB_DIR on OSX
     58
    5659=== cvxopt-1.1.5 (François Bissey, 25 June 2012) ===
    5760 * update to 1.1.5, drop dense.c patch as it is not needed anymore.
    5861 * rewrite and simplify the patch for setup.py. Keep the necessary linking minimal.
  • patches/setup.py.patch

    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 @@
    44 from glob import glob
    55 
    66 # Modifiy this if BLAS and LAPACK libraries are not in /usr/lib.
     
    99+import os
    1010+SAGE_LIB = os.environ['SAGE_LOCAL']+'/lib'
    1111+SAGE_INCLUDE = os.environ['SAGE_LOCAL']+'/include'
    12 +BLAS_LIB_DIR = SAGE_LIB
    1312 
    1413 # Default names of BLAS and LAPACK libraries
    1514-BLAS_LIB = ['blas']
     
    1716 BLAS_EXTRA_LINK_ARGS = []
    1817 
    1918+if os.environ['UNAME'] == 'CYGWIN':
    20 +  BLAS_LIB =['blas', 'gfortran']
     19+    BLAS_LIB =['blas', 'gfortran']
     20+    BLAS_LIB_DIR = '/usr/lib'
    2121+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/'
    2324+else:
    24 +  BLAS_LIB =['f77blas','cblas','gfortran','atlas','m']
     25+    BLAS_LIB =['f77blas','cblas','gfortran','atlas','m']
     26+    BLAS_LIB_DIR = SAGE_LIB
    2527+
    2628 # Set environment variable BLAS_NOUNDERSCORES=1 if your BLAS/LAPACK do
    2729 # not use trailing underscores
     
    4143+GSL_INC_DIR = SAGE_INCLUDE
    4244 
    4345 # 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 @@
    5048 FFTW_INC_DIR = '/usr/include'
    5149 
    5250 # Set to 1 if you are installing the glpk module.