diff --git a/_resources/port1.0/group/fortran-1.0.tcl b/_resources/port1.0/group/fortran-1.0.tcl index 44475ac18c77e..752d421e601bc 100644 --- a/_resources/port1.0/group/fortran-1.0.tcl +++ b/_resources/port1.0/group/fortran-1.0.tcl @@ -21,6 +21,15 @@ if {${os.major} < 14} { git.cmd ${prefix}/bin/git } +# https://github.com/fortran-lang/fpm/issues/1059 +# Drop this upon the next release of FPM: +compiler.blacklist-append \ + macports-gcc-14 +if {${os.platform} ne "darwin" || ${os.major} > 9} { + default_variants-append \ + +gcc13 +} + # Clang of 10.7 fails with multiple packages: error: invalid instruction mnemonic 'cvtsi2sdl' compiler.blacklist-append \ *gcc-4.* {clang < 500} diff --git a/devel/fpm/Portfile b/devel/fpm/Portfile index a60c1d9f81f9a..358103167ce4e 100644 --- a/devel/fpm/Portfile +++ b/devel/fpm/Portfile @@ -32,13 +32,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 13} { git.cmd ${prefix}/bin/git } -# Drop this once old systems are moved to the modern gcc: -if {${os.platform} eq "darwin" && ${os.major} < 10} { - depends_run-append port:gcc7 -} else { - depends_run-append port:gcc13 -} - patchfiles patch-install.diff post-patch { @@ -48,6 +41,14 @@ post-patch { file attributes ${worksrcpath}/install.sh -permissions +x } +# https://github.com/fortran-lang/fpm/issues/1059 +# Drop this block upon the next release. Also drop it from fortran PG. +compiler.blacklist-append \ + macports-gcc-14 +if {${os.platform} ne "darwin" || ${os.major} > 9} { + default_variants +gcc13 +} + # Xcode clang of 10.7 fails with error: invalid instruction mnemonic 'cvtsi2ssl' compiler.blacklist-append \ {clang < 500} {*gcc-[34].*} {macports-gcc-[56]}