<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/5cb5e48e76bd785f163b6ff3fb6583c404f9a13a">https://github.com/macports/macports-ports/commit/5cb5e48e76bd785f163b6ff3fb6583c404f9a13a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5cb5e48e76bd785f163b6ff3fb6583c404f9a13a
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Jul 26 17:02:47 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> libgcc10: Create versionless sym-links to dylibs
</span>---
lang/gcc10/Portfile | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
<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 54ccbdb718e..ca5f5049c70 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;'>@@ -42,7 +42,7 @@ checksums rmd160 5095b725b8846a4946495f5415aab02c3352d763 \
</span> sha256 c9297d5bcd7cb43f3dfc2fed5389e948c9312fd962ef6a4ce455cff963ebe4f1 \
size 75018092
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc10 { revision [ expr ${revision} + 0 ] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc10 { revision [ expr ${revision} + 1 ] }
</span>
if { ${os.platform} eq "darwin" } {
# Patch generated from https://github.com/iains/gcc-10-branch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -311,15 +311,6 @@ if {${subport} ne ${name}} {
</span> --with-gxx-include-dir=${prefix}/include/${name}/c++/ \
--with-gxx-include-dir=${prefix}/include/gcc/c++/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: Possibly disable bootstrap with appropriate configure flags.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the problem is that libstdc++'s configure script tests for tls support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # using the running compiler (not gcc for which libstdc++ is being built).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Thus when we build with clang, we get a mismatch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://trac.macports.org/ticket/36116
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #compiler.blacklist-append {clang < 425}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #configure.args-append --disable-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #build.target all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
# Create temporary lib dir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -335,7 +326,17 @@ if {${subport} ne ${name}} {
</span> continue
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Move dylib to temp area
</span> move ${destroot}${prefix}/lib/libgcc/${dylib} ${destroot}${prefix}/lib/libgcc.merged
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If needed create versionless sym link to dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dylib_split [split ${dylib} "."]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dylib_nover ${destroot}${prefix}/lib/libgcc.merged/[lindex ${dylib_split} 0].[lindex ${dylib_split} end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![file exists ${dylib_nover}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${dylib} ${dylib_nover}
</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;'>+ # Universal support
</span> if {[variant_exists universal] && [variant_isset universal]} {
foreach archdir [glob ${destroot}${prefix}/lib/libgcc/*/] {
set archdir_nodestroot [string map "${destroot}/ /" ${archdir}]
</pre><pre style='margin:0'>
</pre>