<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/400883c9ecd2197f38b6c86d9418e19501e94063">https://github.com/macports/macports-ports/commit/400883c9ecd2197f38b6c86d9418e19501e94063</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 400883c9ecd gcc{12,13}: Only sym link dylibs that exist
</span>400883c9ecd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 400883c9ecd2197f38b6c86d9418e19501e94063
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Sep 28 21:11:46 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> gcc{12,13}: Only sym link dylibs that exist
</span>---
lang/gcc12/Portfile | 28 +++++++++++++++-------------
lang/gcc13/Portfile | 28 +++++++++++++++-------------
2 files changed, 30 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc12/Portfile b/lang/gcc12/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4d508e1664..3109670bd9b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc12/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ long_description {*}${description}, including front ends for \
</span>
# Remember to reset all revision increments below to 0 on new versions
version 12.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>
set libgccname lib${name}
subport ${libgccname} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -459,18 +459,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;color:#808080;'>diff --git a/lang/gcc13/Portfile b/lang/gcc13/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a41f888d0f..b34d0b3e3b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ long_description {*}${description}, including front ends for \
</span>
# Remember to reset all revision increments below to 0 on new versions
version 13.2.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>
set libgccname lib${name}
subport ${libgccname} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -468,18 +468,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> }
}
}
</pre><pre style='margin:0'>
</pre>