* [gentoo-commits] gentoo-x86 commit in dev-python/cvxopt/files: cvxopt-1.1.6-setup.patch
@ 2014-03-26 0:04 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2014-03-26 0:04 UTC (permalink / raw
To: gentoo-commits
bicatali 14/03/26 00:04:00
Modified: cvxopt-1.1.6-setup.patch
Log:
Make it work for multiple library directories and more generic blas/lapack library dependencies
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Revision Changes Path
1.2 dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch?r1=1.1&r2=1.2
Index: cvxopt-1.1.6-setup.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cvxopt-1.1.6-setup.patch 19 Jun 2013 05:41:47 -0000 1.1
+++ cvxopt-1.1.6-setup.patch 26 Mar 2014 00:04:00 -0000 1.2
@@ -102,7 +102,7 @@
library_dirs = [ BLAS_LIB_DIR ],
define_macros = MACROS,
extra_link_args = BLAS_EXTRA_LINK_ARGS,
-@@ -105,61 +98,35 @@
+@@ -105,61 +98,36 @@
extra_link_args = BLAS_EXTRA_LINK_ARGS,
sources = ['src/C/blas.c'] )
@@ -155,9 +155,10 @@
- glob('src/C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
- ['src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
- glob('src/C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
-+ libraries = ['cholmod'] + BLAS_LIB,
-+ define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')],
-+ sources = [ 'src/C/cholmod.c' ])
++ library_dirs = [ BLAS_LIB_DIR ],
++ libraries = ['cholmod'] + BLAS_LIB,
++ define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')],
++ sources = [ 'src/C/cholmod.c' ])
amd = Extension('amd',
- include_dirs = [ 'src/C/SuiteSparse/AMD/Include',
^ permalink raw reply [flat|nested] 2+ messages in thread* [gentoo-commits] gentoo-x86 commit in dev-python/cvxopt/files: cvxopt-1.1.6-setup.patch
@ 2013-06-19 5:41 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2013-06-19 5:41 UTC (permalink / raw
To: gentoo-commits
bicatali 13/06/19 05:41:47
Added: cvxopt-1.1.6-setup.patch
Log:
Version bump
(Portage version: 2.2.01.22013-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Revision Changes Path
1.1 dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch?rev=1.1&content-type=text/plain
Index: cvxopt-1.1.6-setup.patch
===================================================================
--- setup.py.orig 2013-05-16 21:36:29.616510963 +1200
+++ setup.py 2013-05-16 21:51:08.456347311 +1200
@@ -2,7 +2,7 @@
from glob import glob
# Modifiy this if BLAS and LAPACK libraries are not in /usr/lib.
-BLAS_LIB_DIR = '/usr/lib'
+BLAS_LIB_DIR = ''
# Default names of BLAS and LAPACK libraries
BLAS_LIB = ['blas']
@@ -18,37 +18,37 @@
BUILD_GSL = 0
# Directory containing libgsl (used only when BUILD_GSL = 1).
-GSL_LIB_DIR = '/usr/lib'
+GSL_LIB_DIR = ''
# Directory containing the GSL header files (used only when BUILD_GSL = 1).
-GSL_INC_DIR = '/usr/include/gsl'
+GSL_INC_DIR = ''
# Set to 1 if you are installing the fftw module.
BUILD_FFTW = 0
# Directory containing libfftw3 (used only when BUILD_FFTW = 1).
-FFTW_LIB_DIR = '/usr/lib'
+FFTW_LIB_DIR = ''
# Directory containing fftw.h (used only when BUILD_FFTW = 1).
-FFTW_INC_DIR = '/usr/include'
+FFTW_INC_DIR = ''
# Set to 1 if you are installing the glpk module.
BUILD_GLPK = 0
# Directory containing libglpk (used only when BUILD_GLPK = 1).
-GLPK_LIB_DIR = '/usr/lib'
+GLPK_LIB_DIR = ''
# Directory containing glpk.h (used only when BUILD_GLPK = 1).
-GLPK_INC_DIR = '/usr/include'
+GLPK_INC_DIR = ''
# Set to 1 if you are installing the DSDP module.
BUILD_DSDP = 0
# Directory containing libdsdp (used only when BUILD_DSDP = 1).
-DSDP_LIB_DIR = '/usr/lib'
+DSDP_LIB_DIR = ''
# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
-DSDP_INC_DIR = '/usr/include/dsdp'
+DSDP_INC_DIR = ''
# No modifications should be needed below this line.
@@ -61,39 +61,32 @@
# optional modules
if BUILD_GSL:
- gsl = Extension('gsl', libraries = ['m', 'gsl'] + BLAS_LIB,
- include_dirs = [ GSL_INC_DIR ],
- library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ],
- extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ gsl = Extension('gsl', libraries = ['gsl'],
+ library_dirs = [ GSL_LIB_DIR ],
sources = ['src/C/gsl.c'] )
extmods += [gsl];
if BUILD_FFTW:
- fftw = Extension('fftw', libraries = ['fftw3'] + BLAS_LIB,
- include_dirs = [ FFTW_INC_DIR ],
- library_dirs = [ FFTW_LIB_DIR, BLAS_LIB_DIR ],
- extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ fftw = Extension('fftw', libraries = ['fftw3'],
+ library_dirs = [ FFTW_LIB_DIR ],
sources = ['src/C/fftw.c'] )
extmods += [fftw];
if BUILD_GLPK:
glpk = Extension('glpk', libraries = ['glpk'],
- include_dirs = [ GLPK_INC_DIR ],
library_dirs = [ GLPK_LIB_DIR ],
sources = ['src/C/glpk.c'] )
extmods += [glpk];
if BUILD_DSDP:
- dsdp = Extension('dsdp', libraries = ['dsdp'] + LAPACK_LIB + BLAS_LIB,
- include_dirs = [ DSDP_INC_DIR ],
- library_dirs = [ DSDP_LIB_DIR, BLAS_LIB_DIR ],
- extra_link_args = BLAS_EXTRA_LINK_ARGS,
+ dsdp = Extension('dsdp', libraries = ['dsdp'],
+ library_dirs = [ DSDP_LIB_DIR ],
sources = ['src/C/dsdp.c'] )
extmods += [dsdp];
# Required modules
-base = Extension('base', libraries = ['m'] + LAPACK_LIB + BLAS_LIB,
+base = Extension('base', libraries = ['m'] + LAPACK_LIB,
library_dirs = [ BLAS_LIB_DIR ],
define_macros = MACROS,
extra_link_args = BLAS_EXTRA_LINK_ARGS,
@@ -105,61 +98,35 @@
extra_link_args = BLAS_EXTRA_LINK_ARGS,
sources = ['src/C/blas.c'] )
-lapack = Extension('lapack', libraries = LAPACK_LIB + BLAS_LIB,
+lapack = Extension('lapack', libraries = LAPACK_LIB,
library_dirs = [ BLAS_LIB_DIR ],
define_macros = MACROS,
extra_link_args = BLAS_EXTRA_LINK_ARGS,
sources = ['src/C/lapack.c'] )
umfpack = Extension('umfpack',
- include_dirs = [ 'src/C/SuiteSparse/UMFPACK/Include',
- 'src/C/SuiteSparse/AMD/Include',
- 'src/C/SuiteSparse/AMD/Source',
- 'src/C/SuiteSparse/SuiteSparse_config' ],
library_dirs = [ BLAS_LIB_DIR ],
define_macros = MACROS + [('NTIMER', '1'), ('NCHOLMOD', '1')],
- libraries = LAPACK_LIB + BLAS_LIB,
+ libraries = [ 'umfpack' ],
extra_compile_args = ['-Wno-unknown-pragmas'],
- extra_link_args = BLAS_EXTRA_LINK_ARGS,
- sources = [ 'src/C/umfpack.c',
- 'src/C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
- 'src/C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
- ['src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c'] +
- glob('src/C/SuiteSparse_cvxopt_extra/umfpack/*'))
+ sources = [ 'src/C/umfpack.c' ])
# Build for int or long?
import sys
if sys.maxsize > 2**31: MACROS += [('DLONG',None)]
cholmod = Extension('cholmod',
- library_dirs = [ BLAS_LIB_DIR ],
- libraries = LAPACK_LIB + BLAS_LIB,
- include_dirs = [ 'src/C/SuiteSparse/CHOLMOD/Include',
- 'src/C/SuiteSparse/COLAMD',
- 'src/C/SuiteSparse/AMD/Include',
- 'src/C/SuiteSparse/COLAMD/Include',
- 'src/C/SuiteSparse/SuiteSparse_config' ],
- define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')],
- extra_link_args = BLAS_EXTRA_LINK_ARGS,
- sources = [ 'src/C/cholmod.c' ] +
- ['src/C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
- 'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] +
- ['src/C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c',
- 'colamd_global.c']] +
- ['src/C/SuiteSparse/SuiteSparse_config/SuiteSparse_config.c'] +
- glob('src/C/SuiteSparse/CHOLMOD/Core/c*.c') +
- glob('src/C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
- ['src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
- glob('src/C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
+ libraries = ['cholmod'] + BLAS_LIB,
+ define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')],
+ sources = [ 'src/C/cholmod.c' ])
amd = Extension('amd',
- include_dirs = [ 'src/C/SuiteSparse/AMD/Include',
- 'src/C/SuiteSparse/SuiteSparse_config' ],
define_macros = MACROS,
- sources = [ 'src/C/amd.c' ] + glob('src/C/SuiteSparse/AMD/Source/*.c') )
+ libraries = ['amd'],
+ sources = [ 'src/C/amd.c' ])
misc_solvers = Extension('misc_solvers',
- libraries = LAPACK_LIB + BLAS_LIB,
+ libraries = LAPACK_LIB,
library_dirs = [ BLAS_LIB_DIR ],
define_macros = MACROS,
extra_link_args = BLAS_EXTRA_LINK_ARGS,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-03-26 0:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-26 0:04 [gentoo-commits] gentoo-x86 commit in dev-python/cvxopt/files: cvxopt-1.1.6-setup.patch Sebastien Fabbro (bicatali)
-- strict thread matches above, loose matches on Subject: below --
2013-06-19 5:41 Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox