<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/88744d447d08acd05150e1a2e42cc15ef4dccdbf">https://github.com/macports/macports-ports/commit/88744d447d08acd05150e1a2e42cc15ef4dccdbf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 88744d447d08acd05150e1a2e42cc15ef4dccdbf
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sun Nov 10 20:24:55 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-scipy: drop legacysupport PG, link select components
</span>---
python/py-scipy/Portfile | 17 +++-
...03-Use-legacysupport-manually-for-strnlen.patch | 96 ++++++++++++++++++++++
2 files changed, 109 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/Portfile b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 13604808911..5a102a4f493 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scipy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,12 +5,8 @@ PortGroup active_variants 1.1
</span> PortGroup boost 1.0
PortGroup compilers 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup legacysupport 1.1
</span> PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# __sincos ; https://trac.macports.org/ticket/63233
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> name py-scipy
version 1.14.1
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +57,19 @@ if {${name} ne ${subport}} {
</span> patchfiles-append \
0002-patch-extra-flags.patch
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use legacysupport for strnlen, but for select sources.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Adding portgroup breaks the build: https://trac.macports.org/ticket/71272
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libMacportsLegacySupport.dylib:legacy-support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-Use-legacysupport-manually-for-strnlen.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/scipy/io/meson.build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/scipy/sparse/linalg/_eigen/arpack/meson.build \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/scipy/sparse/linalg/_propack/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
if {${python.version} == 39} {
version 1.13.1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/files/0003-Use-legacysupport-manually-for-strnlen.patch b/python/py-scipy/files/0003-Use-legacysupport-manually-for-strnlen.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..84f8e9e030c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scipy/files/0003-Use-legacysupport-manually-for-strnlen.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,96 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a8ecac3ff8ba05bf76a0abf99be92db84dd6f13b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <barracuda@macos-powerpc.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 10 Nov 2024 15:55:00 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Use legacysupport manually for strnlen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scipy/io/meson.build | 6 +++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scipy/optimize/meson.build | 12 ++++++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scipy/sparse/linalg/_eigen/arpack/meson.build | 6 +++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scipy/sparse/linalg/_propack/meson.build | 6 +++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 25 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git scipy/io/meson.build scipy/io/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 60f71c696..bbe5c0159 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scipy/io/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scipy/io/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,8 +4,12 @@ py3.extension_module('_test_fortran',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '_test_fortran.f'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c_args: [Wno_unused_variable],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories: ['@PREFIX@/include/LegacySupport'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fortran_args: fortran_ignore_warnings,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- link_args: version_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_args: [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ version_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-Wl,-lMacportsLegacySupport'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: [lapack_dep, fortranobject_dep],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_language: 'fortran',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git scipy/optimize/meson.build scipy/optimize/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d6c20d3d5..9e682eca1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scipy/optimize/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scipy/optimize/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,7 +100,11 @@ py3.extension_module('_lbfgsb',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f2py_gen.process('lbfgsb_src/lbfgsb.pyf'),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fortran_args: fortran_ignore_warnings,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- link_args: version_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories: ['@PREFIX@/include/LegacySupport'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_args: [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ version_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-Wl,-lMacportsLegacySupport'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: [lapack_dep, blas_dep, fortranobject_dep],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ override_options: ['b_lto=false'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -134,7 +138,11 @@ py3.extension_module('_cobyla',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py3.extension_module('_minpack2',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [f2py_gen.process('minpack2/minpack2.pyf'), 'minpack2/dcsrch.f', 'minpack2/dcstep.f'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fortran_args: fortran_ignore_warnings,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- link_args: version_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories: ['@PREFIX@/include/LegacySupport'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_args: [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ version_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-Wl,-lMacportsLegacySupport'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: [fortranobject_dep],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ override_options: ['b_lto=false'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git scipy/sparse/linalg/_eigen/arpack/meson.build scipy/sparse/linalg/_eigen/arpack/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 08a7b83d1..6fc610e5c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scipy/sparse/linalg/_eigen/arpack/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scipy/sparse/linalg/_eigen/arpack/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,7 +102,11 @@ arpack_module = custom_target('arpack_module',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _arpack = py3.extension_module('_arpack',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arpack_module,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_with: arpack_lib,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- link_args: version_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_args: [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ version_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-Wl,-lMacportsLegacySupport'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories: ['@PREFIX@/include/LegacySupport'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: [lapack_dep, blas_dep, fortranobject_dep],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_language: 'fortran',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git scipy/sparse/linalg/_propack/meson.build scipy/sparse/linalg/_propack/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 671472495..9e42b48de 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scipy/sparse/linalg/_propack/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scipy/sparse/linalg/_propack/meson.build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -101,9 +101,13 @@ foreach ele: elements
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f2py_gen.process(ele[2]),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_with: propack_lib,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c_args: ['-U_OPENMP', _cpp_Wno_cpp],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories: ['@PREFIX@/include/LegacySupport'],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fortran_args: _fflag_Wno_maybe_uninitialized,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dependencies: [lapack_dep, blas_dep, fortranobject_dep],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- link_args: version_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ link_args: [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ version_link_args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-Wl,-lMacportsLegacySupport'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install: true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ link_language: 'fortran',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subdir: 'scipy/sparse/linalg/_propack'
</span></pre><pre style='margin:0'>
</pre>