<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/d5bc72f029a74818f50aea3f2bd83dd047bf7d28">https://github.com/macports/macports-ports/commit/d5bc72f029a74818f50aea3f2bd83dd047bf7d28</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d5bc72f029a74818f50aea3f2bd83dd047bf7d28
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat May 2 18:04:22 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> libgcc9: Update to install only older asan runtime not provided by libgcc10
</span><span style='display:block; white-space:pre;color:#404040;'> gcc9: rev. bump to rebuild
</span>---
lang/gcc9/Portfile | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc9/Portfile b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b74a49..7af9a69 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc9/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,11 +7,11 @@ PortGroup active_variants 1.1
</span> PortGroup conflicts_build 1.0
PortGroup xcode_workaround 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+epoch 3
</span> name gcc9
version 9.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc9 { 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 libgcc9 { revision 1 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ depends_lib port:cctools \
</span> port:mpfr \
port:zlib
depends_run port:gcc_select \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcc9
</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;'>@@ -120,8 +120,6 @@ pre-configure {
</span> configure.args-append --with-sysroot="${configure.sdkroot}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO: Remove when base automatically creates configure.dir (2.2.1?).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${configure.dir}
</span> }
# Added for gcc9+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,7 +167,8 @@ conflicts_build-append libunwind-headers
</span> # Note that we really don't want to include libgcc_ext.10.[45].dylib here, but install_name_tool
# doesn't know how to change the id of stubs, and it's easier than recreating them for each
# gcc port.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set dylibs {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib libgcc_s.1.dylib libgfortran.5.dylib libquadmath.0.dylib libstdc++.6.dylib libobjc-gnu.4.dylib libgomp.1.dylib libitm.1.dylib libssp.0.dylib libasan.5.dylib libubsan.1.dylib libatomic.1.dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set all_dylibs {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib libgcc_s.1.dylib libgfortran.5.dylib libquadmath.0.dylib libstdc++.6.dylib libobjc-gnu.4.dylib libgomp.1.dylib libitm.1.dylib libssp.0.dylib libasan.5.dylib libubsan.1.dylib libatomic.1.dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set install_dylibs {libasan.5.dylib}
</span>
if {${subport} eq "libgcc9"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -209,10 +208,9 @@ if {${subport} eq "libgcc9"} {
</span> # version should continue to provide a subport for that and older gcc
# versions.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span> depends_build-append {*}${depends_lib}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span>
configure.args-replace \
--libdir=${prefix}/lib/${name} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,9 +236,12 @@ if {${subport} eq "libgcc9"} {
</span>
post-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create temporary lib dir
</span> file mkdir ${destroot}${prefix}/lib/libgcc.merged
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dylib ${dylibs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Loop over the specific libs provided by this port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dylib ${install_dylibs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0e0e0;'>@@ -269,15 +270,18 @@ if {${subport} eq "libgcc9"} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove stuff not provided by libgccX ports
</span> file delete -force ${destroot}${prefix}/bin
file delete -force ${destroot}${prefix}/share
file delete -force ${destroot}${prefix}/lib/libgcc
file delete -force ${destroot}${prefix}/libexec
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Move temporary lib dir back in place
</span> move ${destroot}${prefix}/lib/libgcc.merged ${destroot}${prefix}/lib/libgcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # For binary compatibility with binaries that linked against the old libstdcxx port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s libgcc/libstdc++.6.dylib ${destroot}${prefix}/lib/libstdc++.6.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Remove includes. Provided by newer libgcc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -289,11 +293,11 @@ if {${subport} eq "libgcc9"} {
</span> foreach file [glob ${destroot}${prefix}/share/{info,man/man7}/*] {
set extension [file extension ${file}]
set newfile [regsub "${extension}$" ${file} "-mp-${major}${extension}"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> file rename ${file} ${newfile}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dylib ${dylibs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Loop over all the dylibs for this compiler here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dylib ${all_dylibs} {
</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:#e0e0e0;'>@@ -301,7 +305,6 @@ if {${subport} eq "libgcc9"} {
</span> delete ${destroot}${prefix}/lib/${name}/${dylib}
ln -s ${prefix}/lib/libgcc/${dylib} ${destroot}${prefix}/lib/${name}/${dylib}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[variant_isset universal]} {
foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
if {[file exists ${archdir}/${dylib}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -311,6 +314,7 @@ if {${subport} eq "libgcc9"} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> }
select.group gcc
</pre><pre style='margin:0'>
</pre>