<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/d1a8e92315780507a4561135a30c6c6fdbedf664">https://github.com/macports/macports-ports/commit/d1a8e92315780507a4561135a30c6c6fdbedf664</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d1a8e92315780507a4561135a30c6c6fdbedf664
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue May 11 12:58:09 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> gcc10: Apply Xcode 12.5 workaround to gcc10 only, not libgcc10
</span>---
lang/gcc10/Portfile | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 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 7868a725dd1..f8d9b895be1 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;'>@@ -130,26 +130,6 @@ configure.env-append \
</span> OTOOL=${prefix}/bin/otool \
OTOOL64=${prefix}/bin/otool
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# clang (as) from Xcode 12.5 has various problems with gcc build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.platform} eq "darwin" && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ( [ vercmp ${xcodeversion} 12.5 ] >= 0 || [ vercmp ${cltversion} 12.5 ] >= 0 ) } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "Applying '--without-build-config' workaround to Xcode ${xcodeversion} / CLT ${cltversion}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "If versions > 12.5 please check if it is still required"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # clang 11 and older have issues with macOS 11.3 (Xcode 12.5) SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/62770
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {macports-clang-[5-9].0} {macports-clang-1[0-1]}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gcc has build issues on macOS 11.3 with the use of Xcode clang as 'as'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100340
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/62775
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-build-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> pre-configure {
# Set package info
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -248,6 +228,19 @@ if {${subport} ne ${name}} {
</span>
} else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # clang (as) from Xcode 12.5 has various problems with gcc build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.platform} eq "darwin" && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ( [ vercmp ${xcodeversion} 12.5 ] >= 0 || [ vercmp ${cltversion} 12.5 ] >= 0 ) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Applying '--without-build-config' workaround to Xcode ${xcodeversion} / CLT ${cltversion}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "If versions > 12.5 please check if it is still required"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gcc has build issues on macOS 11.3 with the use of Xcode clang as 'as'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100340
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/62775
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --without-build-config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</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>