<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/537d6279daab6afa2177ad077792466cdd16947e">https://github.com/macports/macports-ports/commit/537d6279daab6afa2177ad077792466cdd16947e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 537d6279daab6afa2177ad077792466cdd16947e
</span>Author: Marius Schamschula <mschamschula@gmail.com>
AuthorDate: Wed Jun 14 20:21:38 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> py-numpy: the +gfortran+openblas variant is broken on i386
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/66685
</span>---
python/py-numpy/Portfile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-numpy/Portfile b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f44bf32aee..1db817b26d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-numpy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,6 +128,9 @@ if {${name} ne ${subport}} {
</span>
variant openblas conflicts atlas mkl description "Use MacPorts OpenBLAS Libraries" {
depends_lib-append path:lib/libopenblas.dylib:OpenBLAS
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See: https://trac.macports.org/ticket/66685
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs arm64 ppc ppc64 x86_64
</span> }
variant mkl conflicts atlas openblas description "Use MacPorts MKL Libraries" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,9 +149,11 @@ if {${name} ne ${subport}} {
</span> # overcome issues with polyfit. see also:
# https://trac.macports.org/ticket/56954
# https://github.com/numpy/numpy/issues/12230
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # However, +gfortran+openblas is broken on i386, see above
</span> if {![variant_isset atlas] &&
![variant_isset openblas] &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset mkl]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset mkl] &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure.build_arch} ne "i386"} {
</span> default_variants-append +openblas
}
</pre><pre style='margin:0'>
</pre>