Use system LBFGSB.

Gbp-Pq: Name Use-system-LBFGSB.patch

diff --git a/scipy/optimize/meson.build b/scipy/optimize/meson.build
index c7079e7394eb53700d49f69acd5e8e0d976bdba5..78a006f7d29173957d07558e04e6fd4aeb0f179d 100644 (file)
--- a/scipy/optimize/meson.build
+++ b/scipy/optimize/meson.build
@@ -100,15 +100,12 @@ lbfgsb_module = custom_target('lbfgsb_module',
 
 _lbfgsb = py3.extension_module('_lbfgsb',
   [
-    'lbfgsb_src/lbfgsb.f',
-    'lbfgsb_src/linpack.f',
-    'lbfgsb_src/timer.f',
     lbfgsb_module,
   ],
   c_args: numpy_nodepr_api,
   fortran_args: fortran_ignore_warnings,
   include_directories: [inc_np, inc_f2py],
-  link_args: version_link_args,
+  link_args: version_link_args + ['-llbfgsb'],
   dependencies: [lapack, fortranobject_dep],
   install: true,
   link_language: 'fortran',

diff --git a/scipy/optimize/setup.py b/scipy/optimize/setup.py
index c24ef50ad6776c4a5fa0454fb45707c6164385d0..1dabc2b2efb7aad4a41bb7c3631d9ca6662dd078 100644 (file)
--- a/scipy/optimize/setup.py
+++ b/scipy/optimize/setup.py
@@ -64,8 +64,10 @@ def configuration(parent_package='', top_path=None):
         pre_build_hook = None
 
     lapack = combine_dict(lapack, numpy_nodepr_api)
+    lapack.setdefault('libraries', [])
+    lapack['libraries'].append('lbfgsb')
 
-    sources = ['lbfgsb.pyf', 'lbfgsb.f', 'linpack.f', 'timer.f']
+    sources = ['lbfgsb.pyf']
     ext = config.add_extension('_lbfgsb',
                                sources=[join('lbfgsb_src', x)
                                         for x in sources],