[patch] Rename and always use bundled libqhull

412145a.patch (text/plain), 1.18 KB, created by Martin von Gagern on 2012-06-02 21:25:41 UTC

Rename static libqhull to avoid conflict with system libqhull.

2012-06-02 Martin von Gagern

References:
https://bugs.gentoo.org/412145

Index: scipy-0.10.1/scipy/spatial/setup.py
===================================================================
--- scipy-0.10.1.orig/scipy/spatial/setup.py
+++ scipy-0.10.1/scipy/spatial/setup.py
@@ -16,7 +16,7 @@ def configuration(parent_package = '', t
                  'random.c', 'rboxlib.c', 'stat.c', 'user.c', 'usermem.c',
                  'userprintf.c']
 
-    config.add_library('qhull',
+    config.add_library('scipy_qhull',
                        sources=[join('qhull', 'src', x) for x in qhull_src],
                        include_dirs=[get_python_inc(),
                                      get_numpy_include_dirs()],
@@ -26,9 +26,9 @@ def configuration(parent_package = '', t
 
     lapack = dict(get_info('lapack_opt'))
     try:
-        libs = ['qhull'] + lapack.pop('libraries')
+        libs = ['scipy_qhull'] + lapack.pop('libraries')
     except KeyError:
-        libs = ['qhull']
+        libs = ['scipy_qhull']
     config.add_extension('qhull',
                          sources=['qhull.c'],
                          libraries=libs,