<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/6102af8b588928a2d1d91e50ce94a8a525f8eb4f">https://github.com/macports/macports-ports/commit/6102af8b588928a2d1d91e50ce94a8a525f8eb4f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6102af8b588928a2d1d91e50ce94a8a525f8eb4f
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat May 25 22:02:33 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> gcc10: replace cctools variant logic with compiler blacklist, following cctools update. Update to 10-20190519 snapshot
</span>---
lang/gcc10/Portfile | 56 ++++++++---------------------------------------------
1 file changed, 8 insertions(+), 48 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 9dffff6..cd3dce5 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;'>@@ -8,7 +8,7 @@ PortGroup conflicts_build 1.0
</span>
epoch 3
name gcc10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 10-20190505
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 10-20190519
</span> revision 0
subport libgcc-devel { revision 0 }
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,9 @@ master_sites ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/sn
</span> distname gcc-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 08c507e6d6b888a47f0e998f35c3a43269630c67 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5ef4500a9e440fd9469dabd0a7d2ece133932c199573a70eae38af09b0940a3e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 68789736
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 0e9acd4efa4687cb15b98335aa9bd33c9072a93b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7615e16b43b5ce0320912e055a82273d8311baee657a1e099c7fe5cb6cdad949 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 68850804
</span>
depends_lib port:cctools \
port:gmp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,50 +97,6 @@ configure.env-append \
</span> OTOOL=${prefix}/bin/otool \
OTOOL64=${prefix}/bin/otool
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Make sure the MP clang version used by cctool's 'as' is available at build time and used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${os.major} > 10 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active cctools] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cctools already installed, so figure out from registry what variant to use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # First, is xcode variant in use ?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[active_variants cctools xcode ""]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xcode variant is in use. Warn (as no longer the default) but accept as should still work.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_warn "cctools has (non default) xcode variant active. Consider reinstalling cctools using default variants."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # llvm variant list here must have all possible variants from cctools in it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set llvm_variant_found "no"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {llvm_v llvm_v_nodot} {3.4 34 3.7 37 3.9 39 4.0 40 5.0 50 6.0 60 7.0 70 8.0 80 devel dev} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[active_variants cctools llvm${llvm_v_nodot} ""]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set llvm_variant_found "yes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break
</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;'>- # If we failed to find the active variant, error out as it could mean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # above variant list is out of date.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${llvm_variant_found} eq "no" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Failed to determine active llvm variant for cctools. Please check variant list."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "configuration error"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: cctools has llvm variant ${llvm_v} active"
</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;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # cctools is not yet installed, so have to play 'guess the default variant' :(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Logic here needs to match that used in cctools port.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} <= 11 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set llvm_v 3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ${os.major} <= 13 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set llvm_v 3.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set llvm_v 7.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-clang-${llvm_v}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "${subport}: cctools not active. Will assume default llvm variant is ${llvm_v}"
</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;'>@@ -175,6 +131,10 @@ compiler.blacklist-append {llvm-gcc-4.2 < 2336.1}
</span> # https://trac.macports.org/ticket/47996
compiler.blacklist-append {clang < 300}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/58493
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 800}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.whitelist clang macports-clang-7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # "-stdlib" would be passed on to the bootstrap compiler if present
configure.cxx_stdlib
</pre><pre style='margin:0'>
</pre>