<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/91288cd2d84991dd033ecc7821a01b0720ad8e3a">https://github.com/macports/macports-ports/commit/91288cd2d84991dd033ecc7821a01b0720ad8e3a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 91288cd2d84991dd033ecc7821a01b0720ad8e3a
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Wed Nov 6 10:48:45 2024 -0500

<span style='display:block; white-space:pre;color:#404040;'>    py-scipy: patch meson.build to not error out on SDK detection
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    On older OSes the command '/usr/bin/xcrun -sdk macosx --show-sdk-version' fails.
</span><span style='display:block; white-space:pre;color:#404040;'>    The meson.build script tries to determine whether macOS is 13.3 or above; so if the 'xcrun'
</span><span style='display:block; white-space:pre;color:#404040;'>    fails we are for sure on an older OS.
</span>---
 python/py-scipy/Portfile                           |  6 +++++-
 python/py-scipy/files/patch_scipy_meson.build.diff | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

<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 5abf5de1e5f..71c49817536 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;'>@@ -43,7 +43,8 @@ if {${name} ne ${subport}} {
</span>     # and Clang >= 12.0
     compiler.blacklist-append {clang < 1200}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append   patch-version-caps-pyproject.toml.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-version-caps-pyproject.toml.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch_scipy_meson.build.diff
</span> 
     boost.version       1.81
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,6 +64,9 @@ if {${name} ne ${subport}} {
</span>         patchfiles-replace \
                         patch-version-caps-pyproject.toml.diff \
                         patch-v1.13.1-version-caps-pyproject.toml.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        patch_scipy_meson.build.diff
</span>     }
 
     configure.fflags-append -fno-second-underscore
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scipy/files/patch_scipy_meson.build.diff b/python/py-scipy/files/patch_scipy_meson.build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..126a1776a2e
</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/patch_scipy_meson.build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scipy/meson.build.orig 2024-11-06 11:13:29
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scipy/meson.build      2024-11-06 11:13:21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,10 +182,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macOS13_3_or_later = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if host_machine.system() == 'darwin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  r = run_command('xcrun', '-sdk', 'macosx', '--show-sdk-version', check: true)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  sdkVersion = r.stdout().strip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  macOS13_3_or_later = sdkVersion.version_compare('>=13.3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  r = run_command('xcrun', '-sdk', 'macosx', '--show-sdk-version', check: false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  errortxt = r.stderr().strip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  if errortxt != ''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      macOS13_3_or_later = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      sdkVersion = r.stdout().strip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      macOS13_3_or_later = sdkVersion.version_compare('>=13.3')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _args_blas_lapack = []
</span></pre><pre style='margin:0'>

</pre>