<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/ce950c5729c9178cd6c61f9f4096888a026bb87f">https://github.com/macports/macports-ports/commit/ce950c5729c9178cd6c61f9f4096888a026bb87f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ce950c5729c9178cd6c61f9f4096888a026bb87f
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Jul 19 17:28:45 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> (lib)gcc12: migrate libgccjit to libgcc12, include versionless sym-links
</span>---
lang/gcc12/Portfile | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 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 bb9bec756db..fa85f59e445 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,8 +23,8 @@ long_description {*}${description}, including front ends for \
</span> C, C++, Objective-C, Objective-C++ and Fortran.
version 12.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc12 { revision 4 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc12 { revision [ expr ${revision} + 0 ] }
</span>
checksums rmd160 6cdb114103541230492bbc6093585cb10e5e5ea6 \
sha256 62fd634889f31c02b64af2c468f064b47ad1ca78411c45abe6ac4b5f8dd19c7b \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,7 @@ platform darwin {
</span> }
set gcc_configure_langs {c c++ objc obj-c++ lto fortran}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name} && ${build_arch} ne "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${build_arch} ne "i386"} {
</span> # jit compiler is not building on i386 systems
# https://trac.macports.org/ticket/61130
lappend gcc_configure_langs jit
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,7 +238,7 @@ conflicts_build-append libunwind-headers
</span> set dylibs {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib libgcc_s.1.dylib libgcc_s.1.1.dylib \
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.8.dylib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libubsan.1.dylib libatomic.1.dylib libgcc_ehs.1.1.dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libubsan.1.dylib libatomic.1.dylib libgcc_ehs.1.1.dylib libgccjit.0.dylib}
</span>
if {${subport} ne ${name}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,15 +312,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 {
# Temporary working dir for dylibs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -332,11 +323,21 @@ if {${subport} ne ${name}} {
</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
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {! [file exists ${destroot}${prefix}/lib/libgcc/${dylib}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ![file exists ${destroot}${prefix}/lib/libgcc/${dylib}] } {
</span> continue
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Move dylib to it 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>