Merge branch 'main' into http_status

Author: hoodmane

docs/project/changelog.md

@@ -22,7 +22,12 @@ myst:
   {pr}`4889`
 
 - {{ Enhancement }} `HttpStatusError` now store their the corresponding request
-  `status`, `status_message` and `url` {pr}`4974`.
+  `status`, `status_message` and `url`
+  {pr}`4974`.
+
+- {{ Breaking }} Shared libraries are now loaded locally. This means that packages that
+  depend on shared libraries link to the shared libraries explicitly.
+  {pr}`4876`
 
 - {{ Enhancement }} Added implementation to abort `pyfetch` and `FetchResponse`
   manually or automatically.

emsdk/patches/0006-Load-dependent-libs-globally.patch

@@ -0,0 +1,46 @@
+From 4a3956693056b3ad4f6541589c5ab44df7a7fc39 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?=
+ <[email protected]>
+Date: Wed, 12 Jun 2024 20:10:35 +0200
+Subject: [PATCH 6/6] Make RTLD_LOCAL work correctly for preloaded DSOs
+ (#21985)
+
+Copied from: https://github.com/emscripten-core/emscripten/pull/21985
+This patch can be removed when updating Emscripten version to >= 3.1.62
+
+Follow-up to commit c9a5e63c, for the FS.createPreloadedFile()
+case.
+
+Make sure loadWebAssemblyModule() and loadDynamicLibrary()
+are called with a valid 'localScope' object when invoked
+from the .so file type preload handler.
+---
+ src/library_dylink.js |  4 ++--
+ test/test_core.py     | 46 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 48 insertions(+), 2 deletions(-)
+
+diff --git a/src/library_dylink.js b/src/library_dylink.js
+index 965b119a4..211f4030c 100644
+--- a/src/library_dylink.js
++++ b/src/library_dylink.js
+@@ -26,7 +26,7 @@ var LibraryDylink = {
+         // than just running the promises in parallel, this makes a chain of
+         // promises to run in series.
+         wasmPlugin['promiseChainEnd'] = wasmPlugin['promiseChainEnd'].then(
+-          () => loadWebAssemblyModule(byteArray, {loadAsync: true, nodelete: true}, name)).then(
++          () => loadWebAssemblyModule(byteArray, {loadAsync: true, nodelete: true}, name, {})).then(
+             (exports) => {
+ #if DYLINK_DEBUG
+               dbg(`registering preloadedWasm: ${name}`);
+@@ -877,7 +877,7 @@ var LibraryDylink = {
+     if (flags.loadAsync) {
+       return metadata.neededDynlibs
+         .reduce((chain, dynNeeded) => chain.then(() =>
+-          loadDynamicLibrary(dynNeeded, flags)
++          loadDynamicLibrary(dynNeeded, flags, localScope)
+         ), Promise.resolve())
+         .then(loadModule);
+     }
+-- 
+2.29.2.windows.2
+

emsdk/patches/0006-Make-RTLD_LOCAL-work-correctly-for-preloaded-DSOs-21.patch

@@ -30,7 +30,8 @@ source:
     - patches/0007-Fix-gees-calls.patch
     - patches/0008-MAINT-linalg-Remove-id_dist-Fortran-files.patch
     - patches/0009-Mark-mvndst-functions-recursive.patch
-    - patches/0001-Make-sreorth-recursive.patch
+    - patches/0010-Make-sreorth-recursive.patch
+    - patches/0011-Link-openblas-with-modules-that-require-f2c.patch
 
 build:
   cflags: |

packages/scipy/meta.yaml

@@ -0,0 +1,80 @@
+From 091fb1486525e310a9b8e41d6b4d7a70c965c649 Mon Sep 17 00:00:00 2001
+From: ryanking13 <[email protected]>
+Date: Sun, 28 Jul 2024 18:15:17 +0900
+Subject: [PATCH 1/1] Link openblas with modules that require f2c
+
+Some fortran modules require symbols from f2c, which is provided by
+openblas.
+This patch adds openblas as a dependency to the modules that require f2c
+symbols.
+---
+ scipy/integrate/meson.build | 2 +-
+ scipy/optimize/meson.build  | 4 ++--
+ scipy/special/meson.build   | 2 +-
+ scipy/stats/meson.build     | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/scipy/integrate/meson.build b/scipy/integrate/meson.build
+index 4acc119a5..3c0e0f695 100644
+--- a/scipy/integrate/meson.build
++++ b/scipy/integrate/meson.build
+@@ -167,7 +167,7 @@ py3.extension_module('_dop',
+   _dop_module,
+   link_with: [dop_lib],
+   c_args: [numpy_nodepr_api, Wno_unused_variable],
+-  dependencies: [fortranobject_dep],
++  dependencies: [lapack, fortranobject_dep],
+   link_args: version_link_args,
+   install: true,
+   link_language: 'fortran',
+diff --git a/scipy/optimize/meson.build b/scipy/optimize/meson.build
+index 964edad36..3ca17e3dc 100644
+--- a/scipy/optimize/meson.build
++++ b/scipy/optimize/meson.build
+@@ -138,7 +138,7 @@ _cobyla = py3.extension_module('_cobyla',
+   c_args: [numpy_nodepr_api, Wno_unused_variable],
+   fortran_args: fortran_ignore_warnings,
+   link_args: version_link_args,
+-  dependencies: [fortranobject_dep],
++  dependencies: [lapack, fortranobject_dep],
+   install: true,
+   link_language: 'fortran',
+   subdir: 'scipy/optimize'
+@@ -172,7 +172,7 @@ _slsqp = py3.extension_module('_slsqp',
+   c_args: numpy_nodepr_api,
+   fortran_args: fortran_ignore_warnings,
+   link_args: version_link_args,
+-  dependencies: [fortranobject_dep],
++  dependencies: [lapack, fortranobject_dep],
+   install: true,
+   link_language: 'fortran',
+   subdir: 'scipy/optimize'
+diff --git a/scipy/special/meson.build b/scipy/special/meson.build
+index d166555f5..c0ca05f77 100644
+--- a/scipy/special/meson.build
++++ b/scipy/special/meson.build
+@@ -276,7 +276,7 @@ py3.extension_module('_specfun',
+   specfun_module,
+   c_args: numpy_nodepr_api,
+   link_args: version_link_args,
+-  dependencies: [fortranobject_dep],
++  dependencies: [lapack, fortranobject_dep],
+   link_with: specfun_lib,
+   link_language: 'fortran',
+   install: true,
+diff --git a/scipy/stats/meson.build b/scipy/stats/meson.build
+index 9460f5338..145436fb4 100644
+--- a/scipy/stats/meson.build
++++ b/scipy/stats/meson.build
+@@ -44,7 +44,7 @@ mvn = py3.extension_module('_mvn',
+   # Wno-surprising is to suppress a pointless warning with GCC 10-12
+   # (see GCC bug 98411: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98411)
+   fortran_args: [fortran_ignore_warnings, _fflag_Wno_surprising],
+-  dependencies: [fortranobject_dep],
++  dependencies: [lapack, fortranobject_dep],
+   link_args: version_link_args,
+   install: true,
+   link_language: 'fortran',
+-- 
+2.29.2.windows.2
+