<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/6428e9a620e44787d2fa43ccb52ccd1abd5587c8">https://github.com/macports/macports-ports/commit/6428e9a620e44787d2fa43ccb52ccd1abd5587c8</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 6428e9a gcc*: remove trailing whitespace
</span>6428e9a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6428e9a620e44787d2fa43ccb52ccd1abd5587c8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Mon Jan 20 06:14:33 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gcc*: remove trailing whitespace
</span>---
lang/gcc10/Portfile | 4 ++--
lang/gcc6/Portfile | 2 +-
lang/gcc8/Portfile | 44 ++++++++++++++++++++++----------------------
lang/gcc9/Portfile | 6 +++---
4 files changed, 28 insertions(+), 28 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 3f5b905..f67d700 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;'>@@ -215,12 +215,12 @@ if {${subport} eq "libgcc-devel"} {
</span> #build.target all
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> file mkdir ${destroot}${prefix}/lib/libgcc.merged
# loop over libs to install
foreach dylib ${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
<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 b8b6188..3525bbd 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;'>@@ -58,7 +58,7 @@ if {[vercmp ${xcodeversion} 10.2] >= 0} {
</span> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89864#c43
# https://github.com/Homebrew/homebrew-core/pull/39134/files
# This should be removed in the next release of GCC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append xcode-bug-_Atomic-fix.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append xcode-bug-_Atomic-fix.patch
</span> }
set major [lindex [split ${version} .-] 0]
<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 50c943c..295d382 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;'>@@ -50,7 +50,7 @@ depends_lib port:cctools \
</span> port:libmpc \
port:mpfr \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:gcc_select
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:gcc_select
</span> if { ${isLastSupported} } {
depends_run-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +72,7 @@ if {[vercmp ${xcodeversion} 10.2] >= 0} {
</span> # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89864#c43
# https://github.com/Homebrew/homebrew-core/pull/39134/files
# This should be removed in the next release of GCC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append xcode-bug-_Atomic-fix.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append xcode-bug-_Atomic-fix.patch
</span> }
configure.dir ${workpath}/build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,10 +197,10 @@ if {${subport} eq "libgcc8"} {
</span>
# Are we providing the full main runtime ?
if { ${isLastSupported} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Always provides primary runtime so always in conflict
conflicts libgcc-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # http://trac.macports.org/ticket/35770
# http://trac.macports.org/ticket/38814
# While there can be multiple versions of these runtimes in a single
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -212,25 +212,25 @@ if {${subport} eq "libgcc8"} {
</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
depends_lib-delete port:zlib
depends_build-append {*}${depends_lib}
depends_lib port:zlib
<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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # TODO: Possibly disable bootstrap with appropriate configure flags.
# the problem is that libstdc++'s configure script tests for tls support
# using the running compiler (not gcc for which libstdc++ is being built).
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,11 +239,11 @@ if {${subport} eq "libgcc8"} {
</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 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> 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> foreach dylib ${dylibs} {
# Different OS versions (e.g. Leopard) or architectures (e.g. PPC) don't produce all the dylibs
# https://trac.macports.org/ticket/40098
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,7 +251,7 @@ if {${subport} eq "libgcc8"} {
</span> 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_isset universal]} {
foreach archdir [glob ${destroot}${prefix}/lib/libgcc/*/] {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -265,39 +265,39 @@ if {${subport} eq "libgcc8"} {
</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> 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 ${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> # For binary compatibility with binaries that linked against the old libstdcxx port
ln -s libgcc/libstdc++.6.dylib ${destroot}${prefix}/lib/libstdc++.6.dylib
}
<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> # gcc8 runtime versions are identical to that in gcc9, so libgcc8 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:lib/libgcc/libgcc_s.1.dylib: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}
<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 4a8c59a..071a9f3 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;'>@@ -178,7 +178,7 @@ if { ${os.major} < 11 } {
</span> # gcc cannot build if libunwind-headers is active
conflicts_build-append libunwind-headers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# List of dylibs to be installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# List of dylibs to be installed
</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:#e0e0e0;'>@@ -250,7 +250,7 @@ if {${subport} eq "libgcc9"} {
</span> #build.target all
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> file mkdir ${destroot}${prefix}/lib/libgcc.merged
foreach dylib ${dylibs} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -294,7 +294,7 @@ if {${subport} eq "libgcc9"} {
</span> }
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
file delete ${destroot}${prefix}/share/info/dir
</pre><pre style='margin:0'>
</pre>