From: Gard Spreemann <gspr@nonempty.org>
Date: Sun, 29 Jan 2023 18:55:15 +0000 (+0100)
Subject: Use system LBFGSB.
X-Git-Tag: archive/raspbian/1.10.1-2+rpi1^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e225ee0edf72491d162a7b1446c1c0a64675d75f;p=scipy.git

Use system LBFGSB.


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

diff --git a/scipy/optimize/meson.build b/scipy/optimize/meson.build
index 05db6a68..9066f89d 100644
--- 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 c24ef50a..1dabc2b2 100644
--- 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],