<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/dc700598eba783514ca419e35c4117bd00f2a42a">https://github.com/macports/macports-ports/commit/dc700598eba783514ca419e35c4117bd00f2a42a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dc700598eba783514ca419e35c4117bd00f2a42a
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Jul 6 14:17:41 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> fpm, fortran PG: avoid gcc14 until next release of fpm
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/fortran-lang/fpm/issues/1059
</span>---
_resources/port1.0/group/fortran-1.0.tcl | 9 +++++++++
devel/fpm/Portfile | 15 ++++++++-------
2 files changed, 17 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/fortran-1.0.tcl b/_resources/port1.0/group/fortran-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 44475ac18c7..752d421e601 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/fortran-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/fortran-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +21,15 @@ if {${os.major} < 14} {
</span> git.cmd ${prefix}/bin/git
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/fortran-lang/fpm/issues/1059
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Drop this upon the next release of FPM:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} ne "darwin" || ${os.major} > 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ +gcc13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Clang of 10.7 fails with multiple packages: error: invalid instruction mnemonic 'cvtsi2sdl'
compiler.blacklist-append \
*gcc-4.* {clang < 500}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/fpm/Portfile b/devel/fpm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a60c1d9f81f..358103167ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/fpm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/fpm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,13 +32,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span> git.cmd ${prefix}/bin/git
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Drop this once old systems are moved to the modern gcc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:gcc7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run-append port:gcc13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles patch-install.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,6 +41,14 @@ post-patch {
</span> file attributes ${worksrcpath}/install.sh -permissions +x
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/fortran-lang/fpm/issues/1059
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Drop this block upon the next release. Also drop it from fortran PG.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-gcc-14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} ne "darwin" || ${os.major} > 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +gcc13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Xcode clang of 10.7 fails with error: invalid instruction mnemonic 'cvtsi2ssl'
compiler.blacklist-append \
{clang < 500} {*gcc-[34].*} {macports-gcc-[56]}
</pre><pre style='margin:0'>
</pre>