<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/550b1eb3665328efa287424327a43078b0ba465f">https://github.com/macports/macports-ports/commit/550b1eb3665328efa287424327a43078b0ba465f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 550b1eb3665328efa287424327a43078b0ba465f
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Jul 19 17:29:26 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> (lib)gcc-devel: migrate libgccjit to libgcc-devel, include versionless sym-links
</span>---
lang/gcc-devel/Portfile | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 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 d61f8d64037..2b72023cc52 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;'>@@ -34,8 +34,8 @@ if {${os.arch} eq "arm"} {
</span>
# Version must follow same scheme as with GCC snapshots below <version>-<commit-date>
version 12-20220615
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport libgcc-devel { revision 1 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport libgcc-devel { revision 2 }
</span>
checksums rmd160 49d5ea553c6a8e38eec8f2c4c3ce0706bd971cf8 \
sha256 bcf82d6120b3be42fbdae7f31da0c653c3a8f55a4b686516f9793ccd6753a10a \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,8 +45,8 @@ if {${os.arch} eq "arm"} {
</span> # Use regular GCC releases and snapshsots
version 13-20220717
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- subport libgcc-devel { revision 0 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport libgcc-devel { revision 1 }
</span>
checksums rmd160 64156c961cc479f62c7f7ad027f19fbecf0c40fd \
sha256 685bc20e4af2a1667ac1579a3bf36d9f48b395e998303879cee790b79d344fd4 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,7 +103,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;'>@@ -265,7 +265,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.6.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;'>@@ -331,7 +331,17 @@ if {${subport} ne ${name}} {
</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>