<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/0bb7ebdab12d0a9ad3335dd6059720d68756c876">https://github.com/macports/macports-ports/commit/0bb7ebdab12d0a9ad3335dd6059720d68756c876</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 0bb7ebdab12 gcc10: remove trailing whitespace
</span>0bb7ebdab12 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0bb7ebdab12d0a9ad3335dd6059720d68756c876
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Apr 17 05:16:12 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> gcc10: remove trailing whitespace
</span>---
lang/gcc10/Portfile | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc10/Portfile b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5109edb2624..57e2498ed3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc10/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,20 +247,20 @@ if {${subport} ne ${name}} {
</span> # version of gcc, then the latest version of gcc to provide a given ABI
# version should continue to provide a subport for that and older gcc
# versions.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_run path:share/doc/libgcc/README:libgcc
depends_build-append {*}${depends_lib}
depends_lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace \
--libdir=${prefix}/lib/${name} \
--libdir=${prefix}/lib/libgcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see https://trac.macports.org/ticket/54766
configure.args-replace \
--includedir=${prefix}/include/${name} \
--includedir=${prefix}/include/gcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace \
--with-gxx-include-dir=${prefix}/include/${name}/c++/ \
--with-gxx-include-dir=${prefix}/include/gcc/c++/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -273,22 +273,22 @@ if {${subport} ne ${name}} {
</span> #compiler.blacklist-append {clang < 425}
#configure.args-append --disable-bootstrap
#build.target all
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# Create temporary lib dir
file mkdir ${destroot}${prefix}/lib/libgcc.merged
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Loop over the specific libs provided by this port
foreach dylib ${install_dylibs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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
if {! [file exists ${destroot}${prefix}/lib/libgcc/${dylib}]} {
continue
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> move ${destroot}${prefix}/lib/libgcc/${dylib} ${destroot}${prefix}/lib/libgcc.merged
if {[variant_exists universal] && [variant_isset universal]} {
foreach archdir [glob ${destroot}${prefix}/lib/libgcc/*/] {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -302,23 +302,23 @@ if {${subport} ne ${name}} {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # strip debug symbols to supress debugger warnings:
# http://trac.macports.org/attachment/ticket/34831
if {! [string match *libgcc_ext* ${dylib}]} {
system "strip -x ${destroot}${prefix}/lib/libgcc.merged/${dylib}"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Remove stuff not provided by libgccX ports
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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Move temporary lib dir back in place
move ${destroot}${prefix}/lib/libgcc.merged ${destroot}${prefix}/lib/libgcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Remove includes. Provided by newer libgcc.
file delete -force ${destroot}${prefix}/include
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -326,31 +326,31 @@ if {${subport} ne ${name}} {
</span> xinstall -m 755 -d ${doc_dir}
system "echo ${subport} provides additional runtime > ${doc_dir}/README"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # gcc9 runtime versions are identical to that in gcc10, so libgcc9 does not
# need to provide anything, hence do not build anything.
# port still defined as needed to satisfy dependency tree
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_run path:share/doc/libgcc/README:libgcc
depends_lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> fetch.type none
build { }
use_configure no
patchfiles
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
set doc_dir ${destroot}${prefix}/share/doc/${subport}
xinstall -m 755 -d ${doc_dir}
system "echo ${subport} provides no runtime > ${doc_dir}/README"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#e0ffe0;'>+
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # clang (as) from Xcode 12.5 has various problems with gcc build
if { ${os.platform} eq "darwin" && \
( [ vercmp ${xcodeversion} 12.5 ] >= 0 || [ vercmp ${cltversion} 12.5 ] >= 0 ) } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -361,7 +361,7 @@ if {${subport} ne ${name}} {
</span> # gcc has build issues on macOS 11.3 with the use of Xcode clang as 'as'
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100340
# https://trac.macports.org/ticket/62775
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-build-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --without-build-config
</span> }
post-destroot {
</pre><pre style='margin:0'>
</pre>