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',
