<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch gcc12
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a2f74baca0c5484340872a4fb6f9d77456cbed62">https://github.com/macports/macports-ports/commit/a2f74baca0c5484340872a4fb6f9d77456cbed62</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a2f74baca0c5484340872a4fb6f9d77456cbed62
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Jun 30 11:12:55 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> gcc11: Adapt to GCC12 being new primary runtime
</span>---
lang/gcc11/Portfile | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
<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 155bb8b3733..27014755606 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;'>@@ -7,13 +7,13 @@ PortGroup active_variants 1.1
</span> PortGroup conflicts_build 1.0
PortGroup cltversion 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 1
</span>
name gcc11
# Note, ARM builds have their own version below...
version 11.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
platforms darwin
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ master_sites https://ftpmirror.gnu.org/gcc/gcc-${version}/ \
</span> # Branch from the Darwin maintainer of GCC with Apple Silicon support
if { ${os.arch} eq "arm" } {
version 11.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span> master_sites https://github.com/fxcoudert/gcc/archive
distname gcc-${version}-arm-20211126
checksums rmd160 ce5d0621028c8ff2bf3ab677b29f6c14e4c86dfe \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +105,7 @@ depends_lib-append port:cctools \
</span> port:zlib \
port:zstd
depends_run-append port:gcc_select \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:share/doc/libgcc/README:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcc11
</span>
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,16 +257,14 @@ conflicts_build-append libunwind-headers
</span> # Note that we really don't want to include libgcc_ext.10.[45].dylib here, but install_name_tool
# doesn't know how to change the id of stubs, and it's easier than recreating them for each
# gcc port.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set dylibs {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib libgcc_s.1.dylib libgcc_s.1.1.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set all_dylibs {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib libgcc_s.1.dylib libgcc_s.1.1.dylib \
</span> libgcc_s.2.dylib libgfortran.5.dylib libquadmath.0.dylib libstdc++.6.dylib \
libobjc-gnu.4.dylib libgomp.1.dylib libitm.1.dylib libssp.0.dylib libasan.6.dylib \
libubsan.1.dylib libatomic.1.dylib libgcc_ehs.1.1.dylib}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set install_dylibs {libasan.6.dylib}
</span>
if { ${subport} ne ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Always provides primary runtime so always in conflict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts libgcc-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Activate hack for new libgcc
# https://trac.macports.org/wiki/PortfileRecipes#deactivatehack
pre-activate {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -279,9 +277,9 @@ if { ${subport} ne ${name}} {
</span> }
}
if {![catch {set installed [lindex [registry_active libgcc10] 0]}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Extract the epoch of the installed libgcc9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extract the epoch of the installed libgcc10
</span> set _epoch [lindex $installed 5]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If < 3 need to deactivate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If < 6 need to deactivate
</span> if {[vercmp $_epoch 6] < 0} {
registry_deactivate_composite libgcc10 "" [list ports_nodepcheck 1]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -289,7 +287,7 @@ if { ${subport} ne ${name}} {
</span> if {![catch {set installed [lindex [registry_active libgcc-devel] 0]}]} {
# Extract the epoch of the installed libgcc-devel
set _epoch [lindex $installed 5]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If < 4 need to deactivate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If < 5 need to deactivate
</span> if {[vercmp $_epoch 5] < 0} {
registry_deactivate_composite libgcc-devel "" [list ports_nodepcheck 1]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -308,10 +306,9 @@ if { ${subport} ne ${name}} {
</span> # version should continue to provide a subport for that and older gcc
# versions.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run path:share/doc/libgcc/README:libgcc
</span> depends_build-append {*}${depends_lib}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span>
configure.args-replace \
--libdir=${prefix}/lib/${name} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,7 +338,7 @@ if { ${subport} ne ${name}} {
</span> file mkdir ${destroot}${prefix}/lib/libgcc.merged
# loop over libs to install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dylib ${dylibs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dylib ${install_dylibs} {
</span>
# Different OS versions (e.g. Leopard) or architectures (e.g. PPC) don't produce all the dylibs
# https://trac.macports.org/ticket/40098
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -380,8 +377,12 @@ if { ${subport} ne ${name}} {
</span> # Move temporary lib dir back in place
move ${destroot}${prefix}/lib/libgcc.merged ${destroot}${prefix}/lib/libgcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # For binary compatibility with binaries that linked against the old libstdcxx port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s libgcc/libstdc++.6.dylib ${destroot}${prefix}/lib/libstdc++.6.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove includes. Provided by newer libgcc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set doc_dir ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${doc_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo ${subport} provides additional runtime > ${doc_dir}/README"
</span>
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -398,7 +399,7 @@ if { ${subport} ne ${name}} {
</span> }
# loop over libs to install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dylib ${dylibs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dylib ${all_dylibs} {
</span> # Different OS versions (e.g. Leopard) or architectures (e.g. PPC) don't produce all the dylibs
# https://trac.macports.org/ticket/40098
# https://trac.macports.org/ticket/40100
</pre><pre style='margin:0'>
</pre>