<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9aa2182afcd93d2baeffc480c0b19067c1717bc6">https://github.com/macports/macports-ports/commit/9aa2182afcd93d2baeffc480c0b19067c1717bc6</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 9aa2182afcd libgcc11: use as default on 10.6
</span>9aa2182afcd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9aa2182afcd93d2baeffc480c0b19067c1717bc6
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Jun 20 15:12:56 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> libgcc11: use as default on 10.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> this brings all reasonably supported systems into
</span><span style='display:block; white-space:pre;color:#404040;'> parity so all use gcc11 / libgcc11
</span>---
_resources/port1.0/compilers/gcc_compilers.tcl | 7 ++-----
_resources/port1.0/group/compilers-1.0.tcl | 13 ++-----------
lang/gcc10/Portfile | 2 +-
lang/gcc11/Portfile | 10 +++++++++-
lang/gcc8/Portfile | 15 ++++++++++++---
lang/gcc9/Portfile | 2 +-
lang/libgcc/Portfile | 8 ++------
7 files changed, 29 insertions(+), 28 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/compilers/gcc_compilers.tcl b/_resources/port1.0/compilers/gcc_compilers.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 3593ef2079b..f3e80e970f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/compilers/gcc_compilers.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/compilers/gcc_compilers.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,16 +5,13 @@
</span>
global os.major os.arch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} >= 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} >= 10 } {
</span> lappend compilers macports-gcc-11 macports-gcc-10
}
if { ${os.arch} ne "arm" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers macports-gcc-9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if { ${os.major} >= 10 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend compilers macports-gcc-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend compilers macports-gcc-9 macports-gcc-8
</span> }
if { ${os.major} < 20 } {
lappend compilers macports-gcc-7 macports-gcc-6 macports-gcc-5
<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 8543a6c18a9..96c6edc83c8 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;'>@@ -81,8 +81,6 @@ default compilers.allow_arguments_mismatch no
</span> if {${os.major} < 10} {
# see https://trac.macports.org/ticket/57135
set compilers.gcc_default gcc7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set compilers.gcc_default gcc8
</span> } else {
set compilers.gcc_default gcc11
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,10 +97,7 @@ if { ${os.arch} eq "arm" } {
</span> lappend gcc_versions 5 6 7
}
if { ${os.major} >= 10 } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend gcc_versions 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend gcc_versions 9 10 11 devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend gcc_versions 8 9 10 11 devel
</span> }
}
# GCC version providing the primary runtime
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,11 +105,7 @@ if { ${os.arch} eq "arm" } {
</span> if { ${os.major} < 10 } {
set gcc_main_version 7
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_main_version 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_main_version 10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_main_version 11
</span> }
ui_debug "GCC versions for Darwin ${os.major} ${os.arch} - ${gcc_versions}"
foreach ver ${gcc_versions} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10/Portfile b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ddf294aa9c..d988b95d8e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,7 +168,7 @@ use_parallel_build yes
</span> destroot.target install install-info-host
# Is this gcc release supported here.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 10 } {
</span> known_fail yes
pre-fetch {
ui_error "${name} ${version} is not supported on Darwin ${os.major} ${os.arch}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc11/Portfile b/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d8cc83c9d59..e5f15e08df0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,7 +196,7 @@ use_parallel_build yes
</span> destroot.target install install-info-host
# Is this gcc release supported here.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} < 10 } {
</span> known_fail yes
pre-fetch {
ui_error "${name} ${version} is not supported on Darwin ${os.major}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -224,6 +224,14 @@ if { ${subport} ne ${name}} {
</span> # Activate hack for new libgcc
# https://trac.macports.org/wiki/PortfileRecipes#deactivatehack
pre-activate {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set installed [lindex [registry_active libgcc8] 0]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extract the epoch of the installed libgcc8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set _epoch [lindex $installed 5]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If < 5 need to deactivate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp $_epoch 5] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ registry_deactivate_composite libgcc8 "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> if {![catch {set installed [lindex [registry_active libgcc10] 0]}]} {
# Extract the epoch of the installed libgcc9
set _epoch [lindex $installed 5]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc8/Portfile b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 346c05e469f..795c38ba408 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,11 +8,11 @@ PortGroup conflicts_build 1.0
</span> PortGroup xcode_workaround 1.0
PortGroup cltversion 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 5
</span> name gcc8
version 8.5.0
revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc8 { revision 0 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc8 { revision 1 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,10 @@ checksums rmd160 e7f3dedec67864006bf9f7e358817ce713b4476e \
</span> # If it is, libgcc8 installs a full runtime, otherwise it only installs
# what is missing from newer libgccX builds.
# NOTE : The logic here must match that in the libgcc port.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set isLastSupported [ expr ${os.major} < 11 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#set isLastSupported [ expr ${os.major} < 10 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# libgcc8 is currently not the last supported libgcc for any system
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set isLastSupported false
</span>
patchfiles patch-fix-libgccjit-soname
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,6 +130,12 @@ configure.args --enable-languages=[join ${gcc_configure_langs} ","] \
</span> configure.args-append \
--disable-tls
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# on 10.6.8 building with the system gcc compilers leads to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# bootstrap comparison failures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin 10 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append *gcc-3.* *gcc-4.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${os.platform} eq "darwin" } {
if { [vercmp ${xcodeversion} 12.5] >= 0 || [ vercmp ${cltversion} 12.5 ] >= 0 } {
pre-configure {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/Portfile b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f4cbffd3f6..f6d4c33b87c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,7 +157,7 @@ use_parallel_build yes
</span> destroot.target install install-info-host
# Is this gcc release supported here.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} < 11 || ${os.arch} eq "arm" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.major} < 10 || ${os.arch} eq "arm" } {
</span> known_fail yes
pre-fetch {
ui_error "${name} ${version} is not supported on Darwin ${os.major} ${os.arch}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/libgcc/Portfile b/lang/libgcc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 289aebfcac3..e62ac9c76ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/libgcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/libgcc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup select 1.0
</span>
epoch 3
name libgcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.0
</span> revision 0
conflicts libgcc-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,11 +34,7 @@ variant universal { }
</span> if { ${os.major} < 10 } {
set gcc_version 7
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} < 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_version 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gcc_version 11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gcc_version 11
</span> }
depends_lib port:libgcc${gcc_version}
</pre><pre style='margin:0'>
</pre>