<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/b51a2061565b838dc9580d4dc6c6e4b0bd35142e">https://github.com/macports/macports-ports/commit/b51a2061565b838dc9580d4dc6c6e4b0bd35142e</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b51a2061565 octave: make +openblas default for Monterey
</span>b51a2061565 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b51a2061565b838dc9580d4dc6c6e4b0bd35142e
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Jun 2 07:33:34 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> octave: make +openblas default for Monterey
</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/65260
</span><span style='display:block; white-space:pre;color:#404040;'> clean up darwin platform references
</span>---
math/octave/Portfile | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 21ce6240d2e..7a5a4f2409e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,6 @@ set package_version 7.x.x
</span> revision 0
categories math science
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license GPL-3+
maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
description a high-level language for numerical computations
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +38,7 @@ patchfiles-append patch-better_error.diff
</span>
# bsdtar and tar have different outputs
# starting in Mac OS X Snow Leopard (10.6), tar is an alias of bsdtar
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} >= 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} >= 10 } {
</span> patchfiles-append patch-bsdtar.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,13 +79,13 @@ patchfiles-append bug62436.patch
</span>
post-patch {
if { ${os.arch} eq "i386" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 9 && [sysctl hw.cpu64bit_capable] == 1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} >= 9 && [sysctl hw.cpu64bit_capable] == 1 } {
</span> set short_host_name x86_64-apple-${os.platform}${os.major}.x.x
} else {
set short_host_name i686-apple-${os.platform}${os.major}.x.x
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 9 && [sysctl hw.cpu64bit_capable] == 1 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && ${os.major} >= 9 && [sysctl hw.cpu64bit_capable] == 1 } {
</span> set short_host_name powerpc64-apple-${os.platform}${os.major}.x.x
} else {
set short_host_name powerpc-apple-${os.platform}${os.major}.x.x
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +148,7 @@ configure.env-append "MKDIR_P=/bin/mkdir -p"
</span> # see https://trac.macports.org/ticket/57850
configure.env-append "INSTALL_DATA=\${INSTALL} -m 644 -p"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} > 10 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} > 10 } {
</span> # avoid depends_build-append port:cctools
configure.env-append RANLIB=/usr/bin/ranlib
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -396,6 +395,11 @@ post-patch {
</span> libinterp/corefcn/help.h
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/65260
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} > 20 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +openblas
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
configure.args-append --with-blas="-L${prefix}/lib ${linalglib}" --with-lapack=""
}
</pre><pre style='margin:0'>
</pre>