1 |
bicatali 14/03/26 00:04:00 |
2 |
|
3 |
Modified: cvxopt-1.1.6-setup.patch |
4 |
Log: |
5 |
Make it work for multiple library directories and more generic blas/lapack library dependencies |
6 |
|
7 |
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch?rev=1.2&view=markup |
13 |
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 |
14 |
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 |
15 |
|
16 |
Index: cvxopt-1.1.6-setup.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/cvxopt/files/cvxopt-1.1.6-setup.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- cvxopt-1.1.6-setup.patch 19 Jun 2013 05:41:47 -0000 1.1 |
23 |
+++ cvxopt-1.1.6-setup.patch 26 Mar 2014 00:04:00 -0000 1.2 |
24 |
@@ -102,7 +102,7 @@ |
25 |
library_dirs = [ BLAS_LIB_DIR ], |
26 |
define_macros = MACROS, |
27 |
extra_link_args = BLAS_EXTRA_LINK_ARGS, |
28 |
-@@ -105,61 +98,35 @@ |
29 |
+@@ -105,61 +98,36 @@ |
30 |
extra_link_args = BLAS_EXTRA_LINK_ARGS, |
31 |
sources = ['src/C/blas.c'] ) |
32 |
|
33 |
@@ -155,9 +155,10 @@ |
34 |
- glob('src/C/SuiteSparse/CHOLMOD/Cholesky/c*.c') + |
35 |
- ['src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] + |
36 |
- glob('src/C/SuiteSparse/CHOLMOD/Supernodal/c*.c') ) |
37 |
-+ libraries = ['cholmod'] + BLAS_LIB, |
38 |
-+ define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')], |
39 |
-+ sources = [ 'src/C/cholmod.c' ]) |
40 |
++ library_dirs = [ BLAS_LIB_DIR ], |
41 |
++ libraries = ['cholmod'] + BLAS_LIB, |
42 |
++ define_macros = MACROS + [('NPARTITION', '1'), ('NTIMER', '1')], |
43 |
++ sources = [ 'src/C/cholmod.c' ]) |
44 |
|
45 |
amd = Extension('amd', |
46 |
- include_dirs = [ 'src/C/SuiteSparse/AMD/Include', |