<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b969e67f33fdefebd98179fe687fd0c292dc9c87">https://github.com/macports/macports-ports/commit/b969e67f33fdefebd98179fe687fd0c292dc9c87</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 b969e67f33f compilers PG: Avoid hardcoded gcc version list
</span>b969e67f33f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b969e67f33fdefebd98179fe687fd0c292dc9c87
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Aug 4 10:48:10 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> compilers PG: Avoid hardcoded gcc version list
</span>---
_resources/port1.0/group/compilers-1.0.tcl | 34 +++++++++++++++++-------------
1 file changed, 19 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/compilers-1.0.tcl b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4256efd6bb8..7b05e5c8222 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/compilers-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -776,16 +776,24 @@ pre-configure {
</span> namespace eval compilers {
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+proc compilers::get_current_gcc_version {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global compilers.gcc_default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[fortran_variant_name] eq "gfortran"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fortran_compiler ${compilers.gcc_default}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fortran_compiler [fortran_variant_name]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [regexp {gcc(.*)} ${fortran_compiler} -> gcc_v] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${gcc_v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return UNKNOWN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> proc compilers::add_fortran_legacy_support {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global compilers.allow_arguments_mismatch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compilers.gcc_default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global compilers.allow_arguments_mismatch
</span> if {${compilers.allow_arguments_mismatch}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[fortran_variant_name] eq "gfortran"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fortran_compiler ${compilers.gcc_default}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fortran_compiler [fortran_variant_name]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${fortran_compiler} in "gcc12 gcc11 gcc10 gccdevel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_v [compilers::get_current_gcc_version]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${gcc_v} >= 10 || ${gcc_v} == "devel" } {
</span> configure.fflags-delete -fallow-argument-mismatch
configure.fcflags-delete -fallow-argument-mismatch
configure.f90flags-delete -fallow-argument-mismatch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -799,13 +807,9 @@ proc compilers::add_fortran_legacy_support {} {
</span> port::register_callback compilers::add_fortran_legacy_support
proc compilers::add_gcc_rpath_support {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global compilers.gcc_default prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[fortran_variant_name] eq "gfortran"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fortran_compiler ${compilers.gcc_default}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set fortran_compiler [fortran_variant_name]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${fortran_compiler} in "gcc12 gcc11 gcc10 gccdevel"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_v [compilers::get_current_gcc_version]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${gcc_v} >= 10 || ${gcc_v} == "devel" } {
</span> configure.ldflags-delete -Wl,-rpath,${prefix}/lib/libgcc
configure.ldflags-append -Wl,-rpath,${prefix}/lib/libgcc
}
</pre><pre style='margin:0'>
</pre>