[python-cvxopt] Add linkage to fix undefined symbols (bz 832475).
Jerry James
jjames at fedoraproject.org
Wed Oct 10 17:02:35 UTC 2012
commit 566810e6e8c9e4099101cbdd5d358d7c5f66d8a7
Author: Jerry James <jamesjer at betterlinux.com>
Date: Wed Oct 10 11:02:17 2012 -0600
Add linkage to fix undefined symbols (bz 832475).
python-cvxopt-setup.patch | 11 +++++++----
python-cvxopt.spec | 5 ++++-
2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/python-cvxopt-setup.patch b/python-cvxopt-setup.patch
index dbbc643..1441059 100644
--- a/python-cvxopt-setup.patch
+++ b/python-cvxopt-setup.patch
@@ -1,5 +1,5 @@
--- ./src/setup.py.orig 2012-03-27 14:05:13.000000000 -0600
-+++ ./src/setup.py 2012-04-02 15:36:07.621568810 -0600
++++ ./src/setup.py 2012-10-10 10:57:33.820273950 -0600
@@ -2,10 +2,10 @@ from distutils.core import setup, Extens
from glob import glob
@@ -66,7 +66,8 @@
+ include_dirs = [ '/usr/include/suitesparse' ],
library_dirs = [ BLAS_LIB_DIR ],
define_macros = MACROS,
- libraries = LAPACK_LIB + BLAS_LIB,
+- libraries = LAPACK_LIB + BLAS_LIB,
++ libraries = LAPACK_LIB + BLAS_LIB + [ 'umfpack' ],
extra_link_args = BLAS_EXTRA_LINK_ARGS,
- sources = [ 'C/umfpack.c',
- 'C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
@@ -76,13 +77,15 @@
# Build for int or long?
import sys
-@@ -131,26 +126,16 @@ if sys.maxsize > 2**31: MACROS += [('DLO
+@@ -130,27 +125,17 @@ if sys.maxsize > 2**31: MACROS += [('DLO
+
cholmod = Extension('cholmod',
library_dirs = [ BLAS_LIB_DIR ],
- libraries = LAPACK_LIB + BLAS_LIB,
+- libraries = LAPACK_LIB + BLAS_LIB,
- include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include',
- 'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include',
- 'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
++ libraries = LAPACK_LIB + BLAS_LIB + [ 'cholmod' ],
+ include_dirs = [ '/usr/include/suitesparse' ],
define_macros = MACROS + [('NPARTITION', '1')],
extra_link_args = BLAS_EXTRA_LINK_ARGS,
diff --git a/python-cvxopt.spec b/python-cvxopt.spec
index e543487..8254461 100644
--- a/python-cvxopt.spec
+++ b/python-cvxopt.spec
@@ -1,6 +1,6 @@
Name: python-cvxopt
Version: 1.1.5
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A Python Package for Convex Optimization
Group: Development/Languages
License: GPLv3+
@@ -126,6 +126,9 @@ cp -a examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%changelog
+* Wed Oct 10 2012 Jerry James <loganjerry at gmail.com> - 1.1.5-5
+- Add linkage to fix undefined symbols (bz 832475)
+
* Sat Aug 04 2012 David Malcolm <dmalcolm at redhat.com> - 1.1.5-4
- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3
More information about the scm-commits
mailing list