<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/b0ae279377bb3e40008661959756a6b5eedcbf61">https://github.com/macports/macports-ports/commit/b0ae279377bb3e40008661959756a6b5eedcbf61</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 b0ae279 gcc6: Tidy up indentation. Trigger rebuild on Darwin 10 following libgcc7 fixes.
</span>b0ae279 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b0ae279377bb3e40008661959756a6b5eedcbf61
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat Aug 4 17:41:36 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> gcc6: Tidy up indentation. Trigger rebuild on Darwin 10 following libgcc7 fixes.
</span>---
lang/gcc6/Portfile | 52 +++++++++++++++++++++++++++-------------------------
1 file changed, 27 insertions(+), 25 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 a4fc961..b137021 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;'>@@ -224,42 +224,44 @@ if {${subport} eq "libgcc6"} {
</span> # This is provided by the libgcc port
file delete -force ${destroot}${prefix}/lib/libgcc/libquadmath.0.dylib
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:gcc_select \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgcc6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:gcc_select \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcc6
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/share/info/dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file [glob ${destroot}${prefix}/share/{info,man/man7}/*] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set extension [file extension ${file}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set newfile [regsub "${extension}$" ${file} "-mp-${major}${extension}"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${destroot}${prefix}/share/info/dir
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${file} ${newfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach file [glob ${destroot}${prefix}/share/{info,man/man7}/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set extension [file extension ${file}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set newfile [regsub "${extension}$" ${file} "-mp-${major}${extension}"]
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dylib {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib libgcc_s.1.dylib libgfortran.3.dylib libquadmath.0.dylib libstdc++.6.dylib libobjc-gnu.4.dylib libgomp.1.dylib libitm.1.dylib libssp.0.dylib libasan.3.dylib libatomic.1.dylib} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Different OS versions (e.g. Leopard) or architectures (e.g. PPC) don't produce all the dylibs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/40098
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/40100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${destroot}${prefix}/lib/${name}/${dylib}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/lib/${name}/${dylib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/libgcc/${dylib} ${destroot}${prefix}/lib/${name}/${dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${file} ${newfile}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists ${archdir}/${dylib}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${archdir}/${dylib}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/libgcc/${dylib} ${archdir}/${dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dylib {libgcc_ext.10.4.dylib libgcc_ext.10.5.dylib libgcc_s.1.dylib libgfortran.3.dylib libquadmath.0.dylib libstdc++.6.dylib libobjc-gnu.4.dylib libgomp.1.dylib libitm.1.dylib libssp.0.dylib libasan.3.dylib libatomic.1.dylib} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Different OS versions (e.g. Leopard) or architectures (e.g. PPC) don't produce all the dylibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/40098
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/40100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${prefix}/lib/${name}/${dylib}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/lib/${name}/${dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/libgcc/${dylib} ${destroot}${prefix}/lib/${name}/${dylib}
</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;'>+ if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach archdir [glob ${destroot}${prefix}/lib/${name}/*/] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${archdir}/${dylib}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${archdir}/${dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/libgcc/${dylib} ${archdir}/${dylib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-select.group gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-select.file ${filespath}/mp-${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select.group gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ select.file ${filespath}/mp-${name}
</span>
}
</pre><pre style='margin:0'>
</pre>