Sébastien Villemot wrote: > Looking at the patch glpk-4.49.diff that I have added in the package in > order to provide a compatibility layer, it looks like I forgot to link > lpx.c into glpk.so (which also means that I did not test the package > before NMUing, shame on me).
Lol. Good catch. ^^ Attached is much smaller fix, suitable for an p-u. -- Nirgal
Description: Fix "undefined symbol: lpx_create_prob" bugs in glpk . Actually link the lpx compatibility file . Fix the conditionnal wrapper position and arguments in lpx.c Author: Jean-Michel Nirgal Vourgère <jmv_...@nirgal.com> Bug-Debian: https://bugs.debian.org/780251 Forwarded: not-needed Last-Update: 2015-03-11 Index: cvxopt-1.1.4/src/setup.py =================================================================== --- cvxopt-1.1.4.orig/src/setup.py +++ cvxopt-1.1.4/src/setup.py @@ -63,7 +63,7 @@ if BUILD_GLPK: glpk = Extension('glpk', libraries = ['glpk'], include_dirs = [ GLPK_INC_DIR ], library_dirs = [ GLPK_LIB_DIR ], - sources = ['C/glpk.c'] ) + sources = ['C/glpk.c', 'C/lpx.c'] ) extmods += [glpk]; if BUILD_DSDP: Index: cvxopt-1.1.4/src/C/lpx.c =================================================================== --- cvxopt-1.1.4.orig/src/C/lpx.c +++ cvxopt-1.1.4/src/C/lpx.c @@ -11,12 +11,12 @@ * Please note that you may mix calls to old and new GLPK API routines * (except calls to glp_create_prob and glp_delete_prob). */ -#if (GLP_VERSION_MAJOR == 4 && GLP_MINOR_VERSION >= 49) || GLP_VERSION_MAJOR > 4 - #include <float.h> #include <limits.h> #include "lpx.h" +#if (GLP_MAJOR_VERSION == 4 && GLP_MINOR_VERSION >= 49) || GLP_MAJOR_VERSION > 4 + #define xassert glp_assert #define xerror glp_error
signature.asc
Description: OpenPGP digital signature
