Ticket #13799: cvxopt-1.1.5.p0.diff

File cvxopt-1.1.5.p0.diff, 1.5 KB (added by jpflori, 9 years ago)

Spkg diff, for review only.

  • SPKG.txt

    diff -r 408f5248985b SPKG.txt
    a b  
    2626Downloaded from http://abel.ee.ucla.edu/cvxopt/
    2727
    2828== License ==
    29 GPLv3 or later. Includes parts under GPLv2,
     29
     30GPLv3 or later. Includes parts under GPLv2,
    3031GNU Lesser General Public License, v2.1.  See src/LICENSE for more details.
    31 (Sage-compatible) 
     32(Sage-compatible)
    3233
    3334== Dependencies ==
    3435
     
    5354
    5455== Changelog ==
    5556
     57=== cvxopt-1.1.5.p0 (Jean-Pierre Flori, 5 December 2012) ===
     58 * #13799: add back linking dependencies removed by #13160 and needed on Cygwin.
     59
    5660=== cvxopt-1.1.5 (François Bissey, 25 June 2012) ===
    57  * update to 1.1.5, drop dense.c patch as it is not needed anymore.
     61 * #13160: update to 1.1.5, drop dense.c patch as it is not needed anymore.
    5862 * rewrite and simplify the patch for setup.py. Keep the necessary linking minimal.
    5963 * First attempt at doc building
    6064
  • patches/setup.py.patch

    diff -r 408f5248985b patches/setup.py.patch
    a b  
    6363 
    6464 # Set to 1 if you are installing the DSDP module.
    6565 BUILD_DSDP = 0
     66@@ -77,7 +87,7 @@
     67     extmods += [fftw];
     68 
     69 if BUILD_GLPK:
     70+    glpk = Extension('glpk', libraries = ['glpk', 'gmp', 'z'],
     71-    glpk = Extension('glpk', libraries = ['glpk'],
     72         include_dirs = [ GLPK_INC_DIR ],
     73         library_dirs = [ GLPK_LIB_DIR ],
     74         sources = ['C/glpk.c'] )