<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/7ace16a909d1ab3acba2bdc41bc76938f9382d4c">https://github.com/macports/macports-ports/commit/7ace16a909d1ab3acba2bdc41bc76938f9382d4c</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 7ace16a909d (lib)gcc-devel: Update to 20250510 snapshot
</span>7ace16a909d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7ace16a909d1ab3acba2bdc41bc76938f9382d4c
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Mon May 12 14:35:40 2025 +0100
<span style='display:block; white-space:pre;color:#404040;'> (lib)gcc-devel: Update to 20250510 snapshot
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also sychronise some updates from gcc14 Portfile
</span>---
lang/gcc-devel/Portfile | 106 +++++++++++++++++++++++++++++++-----------------
1 file changed, 68 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc-devel/Portfile b/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 16696b43397..102c6257649 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,13 +27,13 @@ set libgccname lib${name}
</span>
set libcxxname ${name}-libcxx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 15-20240630
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 15-20250510
</span> revision 0
subport ${libgccname} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5a5baf2efa5750eb6952fe48c3cd061b58039b37 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e5d214bafbce9fc30ac916603765f3bf4bd79faee4ad0d2693772b066638568f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 88427396
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 36294e955fe0834efe59e02e17e1c434fe5fb1f9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d019003a5caadf35df04d22f6d398d602ff16318db928443aab0a6b7f756843f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 92092512
</span>
# Primary releases
master_sites https://ftpmirror.gnu.org/gcc/gcc-${version}/ \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,6 +71,17 @@ depends_lib-append port:cctools \
</span> depends_run-append port:gcc_select \
port:libgcc-devel
<span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {(${configure.build_arch} in [list ppc ppc64]) || ${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.compiler.add_deps \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gcc10-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc ${prefix}/libexec/gcc10-bootstrap/bin/gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx ${prefix}/libexec/gcc10-bootstrap/bin/g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>@@ -82,6 +93,8 @@ set major devel
</span> proc gcc_arch {arch} {
switch ${arch} {
arm64 {return aarch64}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc64 {return powerpc64}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc {return powerpc}
</span> default {return ${arch}}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,9 +112,20 @@ if {${subport} eq ${name} && ${build_arch} ne "i386"} {
</span> }
proc get_clean_sysroot {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global configure.sdkroot
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if the sdkroot is one of the current, rapidly changing SDKS, use the generic one
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [regsub {MacOSX1[1-9]\.[0-9]+\.sdk} ${configure.sdkroot} {MacOSX.sdk}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global configure.sdkroot configure.sdk_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set new_sdk ${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [regexp {MacOSX(.*).sdk} ${configure.sdkroot} -> sdk_v] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${sdk_v} != "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If present strip minor version from SDK version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set sdk_major [lindex [split $sdk_v .] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Detected versioned SDK ${sdk_v} ${sdk_major} ${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set new_sdk [regsub {MacOSX1[1-9]\.[0-9]+\.sdk} ${configure.sdkroot} MacOSX${sdk_major}.sdk]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${new_sdk} != ${configure.sdkroot} } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug " New SDK ${new_sdk}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${new_sdk}
</span> }
set mp_extra_rpath ${prefix}/lib/libgcc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,7 +228,8 @@ configure.env-append \
</span> OTOOL64=${prefix}/bin/otool
if {${os.platform} eq "darwin" && ${os.major} >= 22} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [vercmp ${xcodeversion} >= 15.0] || [vercmp ${xcodecltversion} >= 15.0] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ([vercmp ${xcodeversion} >= 15.0] && [vercmp ${xcodeversion} < 16.0]) ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ([vercmp ${xcodecltversion} >= 15.0] && [vercmp ${xcodecltversion} < 16.0]) } {
</span> # On macOS13 and newer ensure the 'legacy' linker is used as GCC currently has problems
# with the new default linker in Xcode 15. See e.g.
# https://developer.apple.com/documentation/xcode-release-notes/xcode-15-release-notes#Linking
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,7 +273,11 @@ subport ${libcxxname} {
</span> if { ${os.platform} eq "darwin" && ${os.major} < 11 } {
default_variants-append +clang11
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} < 24 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
revision [ expr ${revision} + 0 ]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -303,7 +332,7 @@ if { ${subport} ne ${libcxxname} } {
</span> }
# libcxx is unavailable on PPC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} ni [list ppc ppc64] && ${os.major} > 8} {
</span> default_variants-append +stdlib_flag
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,8 +370,8 @@ build.target bootstrap-lean
</span>
destroot.target install install-info-host
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# gcc cannot build if libunwind-headers is active
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts_build-append libunwind-headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gcc cannot build if these are active
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build-append libunwind-headers binutils gdb
</span>
# Find dylibs at a given location
proc dylib_list {location} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -466,18 +495,20 @@ if {${subport} eq ${name}} {
</span> # loop over libs to install
set dylibs [dylib_list ${destroot}${prefix}/lib/${name}]
foreach dylib ${dylibs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Different OS versions (e.g. Leopard) or architectures (e.g. PPC) don't produce all the dylibs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/40098
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/40100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${destroot}${prefix}/lib/${name}/${dylib}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/lib/${name}/${dylib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/libgcc/${dylib} ${destroot}${prefix}/lib/${name}/${dylib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${archdir}/${dylib}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${archdir}/${dylib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/libgcc/${dylib} ${archdir}/${dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [file exists ${prefix}/lib/libgcc/${dylib}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Different OS versions (e.g. Leopard) or architectures (e.g. PPC) don't produce all the dylibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/40098
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/40100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${prefix}/lib/${name}/${dylib}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/lib/${name}/${dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/libgcc/${dylib} ${destroot}${prefix}/lib/${name}/${dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${archdir}/${dylib}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${archdir}/${dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/libgcc/${dylib} ${archdir}/${dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -515,23 +546,22 @@ if { ${subport} ne ${libcxxname} } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform powerpc {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs ppc ppc64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" && ${os.major} >= 20 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.platform} eq "darwin" && ${os.major} <= 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch -- $build_arch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ i386 -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x86_64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ppc64 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.universal_archs ppc ppc64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform arm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs x86_64 arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant universal {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-multilib
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform i386 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.universal_archs i386 x86_64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-multilib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</span> }
# the generated compiler doesn't accept -arch
configure.env-append \
</pre><pre style='margin:0'>
</pre>