<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bb3821d49fd1b22d35c82964e158995eb990bf05">https://github.com/macports/macports-ports/commit/bb3821d49fd1b22d35c82964e158995eb990bf05</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bb3821d49fd1b22d35c82964e158995eb990bf05
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Aug 12 07:45:27 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> libgcc*: fix universal build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Avoid
</span><span style='display:block; white-space:pre;color:#404040;'> "Could not open /opt/local/lib/libgcc/i386/libstdc++.6.dylib"
</span>---
lang/gcc45/Portfile | 4 ++--
lang/gcc6/Portfile | 4 ++--
lang/gcc7/Portfile | 4 ++--
lang/gcc8/Portfile | 2 +-
lang/gcc9/Portfile | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc45/Portfile b/lang/gcc45/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f333b28..412dd9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc45/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc45/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ name gcc45
</span> epoch 1
version 4.5.4
revision 14
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc45 { revision 14 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc45 { revision 15 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -240,7 +240,7 @@ if {${subport} == "libgcc45"} {
</span> set archdir_nodestroot [string map "${destroot}/ /" ${archdir}]
if {[file exists ${archdir}/${dylib}]} {
system "install_name_tool -id ${prefix}/lib/libgcc/${dylib} ${archdir}/${dylib}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach link ${dylibs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach link [glob -tails -directory ${archdir} *.dylib] {
</span> system "install_name_tool -change ${archdir_nodestroot}${link} ${prefix}/lib/libgcc/${link} ${archdir}/${dylib}"
}
system "lipo -create -output ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib} ${archdir}/${dylib} && mv ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib}"
<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 b137021..48ff780 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;'>@@ -8,7 +8,7 @@ name gcc6
</span> epoch 2
version 6.4.0
revision 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc6 { revision 3 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc6 { revision 4 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,7 +198,7 @@ if {${subport} eq "libgcc6"} {
</span> set archdir_nodestroot [string map "${destroot}/ /" ${archdir}]
if {[file exists ${archdir}/${dylib}]} {
system "install_name_tool -id ${prefix}/lib/libgcc/${dylib} ${archdir}/${dylib}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach link ${dylibs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach link [glob -tails -directory ${archdir} *.dylib] {
</span> system "install_name_tool -change ${archdir_nodestroot}${link} ${prefix}/lib/libgcc/${link} ${archdir}/${dylib}"
}
system "lipo -create -output ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib} ${archdir}/${dylib} && mv ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc7/Portfile b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0da1538..a72c36b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name gcc7
</span> epoch 2
version 7.3.0
revision 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport libgcc7 { revision 1 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport libgcc7 { revision 2 }
</span> platforms darwin
categories lang
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,7 +238,7 @@ if {${subport} eq "libgcc7" } {
</span> set archdir_nodestroot [string map "${destroot}/ /" ${archdir}]
if {[file exists ${archdir}/${dylib}]} {
system "install_name_tool -id ${prefix}/lib/libgcc/${dylib} ${archdir}/${dylib}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach link ${dylibs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach link [glob -tails -directory ${archdir} *.dylib] {
</span> system "install_name_tool -change ${archdir_nodestroot}${link} ${prefix}/lib/libgcc/${link} ${archdir}/${dylib}"
}
system "lipo -create -output ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib} ${archdir}/${dylib} && mv ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc8/Portfile b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1983523..79687d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,7 +233,7 @@ if {${subport} eq "libgcc8"} {
</span> set archdir_nodestroot [string map "${destroot}/ /" ${archdir}]
if {[file exists ${archdir}/${dylib}]} {
system "install_name_tool -id ${prefix}/lib/libgcc/${dylib} ${archdir}/${dylib}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach link ${dylibs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach link [glob -tails -directory ${archdir} *.dylib] {
</span> system "install_name_tool -change ${archdir_nodestroot}${link} ${prefix}/lib/libgcc/${link} ${archdir}/${dylib}"
}
system "lipo -create -output ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib} ${archdir}/${dylib} && mv ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib}"
<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 08e5661..b2a3979 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;'>@@ -210,7 +210,7 @@ if {${subport} eq "libgcc-devel"} {
</span> set archdir_nodestroot [string map "${destroot}/ /" ${archdir}]
if {[file exists ${archdir}/${dylib}]} {
system "install_name_tool -id ${prefix}/lib/libgcc/${dylib} ${archdir}/${dylib}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach link ${dylibs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach link [glob -tails -directory ${archdir} *.dylib] {
</span> system "install_name_tool -change ${archdir_nodestroot}${link} ${prefix}/lib/libgcc/${link} ${archdir}/${dylib}"
}
system "lipo -create -output ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib} ${archdir}/${dylib} && mv ${destroot}${prefix}/lib/libgcc.merged/${dylib}~ ${destroot}${prefix}/lib/libgcc.merged/${dylib}"
</pre><pre style='margin:0'>
</pre>