<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/46baadbb579e804092d71e9faf01481972cf0a22">https://github.com/macports/macports-ports/commit/46baadbb579e804092d71e9faf01481972cf0a22</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 46baadbb libgcc6: Fix linkage against libquadmath when built +universal
</span>46baadbb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 46baadbb579e804092d71e9faf01481972cf0a22
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Thu Sep 7 16:47:06 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> libgcc6: Fix linkage against libquadmath when built +universal
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/54768
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
lang/gcc6/Portfile | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc6/Portfile b/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1621764..1e9df3b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc6/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup select 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name gcc6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc6 {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc6 { revision 1 }
</span>
epoch 2
version 6.4.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,10 +169,9 @@ if {${subport} eq "libgcc6"} {
</span> post-destroot {
file mkdir ${destroot}${prefix}/lib/libgcc.merged
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that we really don't want to include libgcc_ext.10.[45].dylib here, but install_name_tool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # doesn't know how to change the id of stubs, and it's easier than recreating them for each
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gcc port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set dylibs {libgfortran.3.dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We need to list libquadmath.0.dylib here even though it isn't installed in order to make sure we cleanup libgfortran.3.dylib's linkage when +universal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://trac.macports.org/ticket/54768
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dylibs {libgfortran.3.dylib libquadmath.0.dylib}
</span>
foreach dylib ${dylibs} {
# Different OS versions (e.g. Leopard) or architectures (e.g. PPC) don't produce all the dylibs
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -210,6 +209,9 @@ if {${subport} eq "libgcc6"} {
</span> file delete -force ${destroot}${prefix}/libexec
move ${destroot}${prefix}/lib/libgcc.merged ${destroot}${prefix}/lib/libgcc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is provided by the libgcc port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/lib/libgcc/libquadmath.0.dylib
</span> }
} else {
depends_run-append port:gcc_select \
</pre><pre style='margin:0'>
</pre>