<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5cbe41b22fb3e738be3aa0f2eddb9bea0248a7ca">https://github.com/macports/macports-ports/commit/5cbe41b22fb3e738be3aa0f2eddb9bea0248a7ca</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 5cbe41b22fb cctools: tweak defaults
</span>5cbe41b22fb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5cbe41b22fb3e738be3aa0f2eddb9bea0248a7ca
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Sat Dec 19 16:24:32 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> cctools: tweak defaults
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> cctools in xcode is newer than the cctools port
</span><span style='display:block; white-space:pre;color:#404040;'> for all systems that use Xcode 11 or newer,
</span><span style='display:block; white-space:pre;color:#404040;'> so default to +xcode on those systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> the llvm-11 version of llvm-objdump changed the
</span><span style='display:block; white-space:pre;color:#404040;'> arguments it accepts, causing many builds to break
</span><span style='display:block; white-space:pre;color:#404040;'> use llvm-10 by default instead of llvm-11 until
</span><span style='display:block; white-space:pre;color:#404040;'> such time as xcode also shares that new default
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> users who want to find bugs and fix them can manually use
</span><span style='display:block; white-space:pre;color:#404040;'> the llvm11 variant of cctools to find and discover these
</span><span style='display:block; white-space:pre;color:#404040;'> bugs if they choose to do so
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/61852
</span>---
devel/cctools/Portfile | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cctools/Portfile b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e2aa89758c..7ba8fcf768a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cctools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,34 +76,35 @@ proc some_llvm_variant_set {} {
</span> return no
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform arm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The llvm ports don't support arm yet.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +xcode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if { ![some_llvm_variant_set] && ![variant_isset xcode] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} == 14 || ${os.major} == 15} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +llvm90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${os.major} == 12 || ${os.major} == 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 11 has a newer cctools than the current cctools port
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we can't use xcodeversion to test this as that returns none if only the CLTs are installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # so we assume that Mojave and newer have a newer ld64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this test can be moved up as the cctools port is newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +xcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.major} >= 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # llvm-11 changed the arguments accepted by llvm-dump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this causes a number of errors in scripts that still use the old arguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we will change this to llvm11 when xcode changes to require the new arguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://reviews.llvm.org/D92310 and https://trac.macports.org/ticket/61852
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +llvm10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.major} >= 12} {
</span> # Using llvm-3.7 to break a dependency cycle (https://trac.macports.org/ticket/53138)
default_variants +llvm37
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${os.major} == 10 || ${os.major} == 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${os.major} >= 10} {
</span> default_variants +llvm34
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TODO?: cctools-895 requires llvm-3.4 as a minimum version for LTO support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # elseif {${os.major} == 9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # # Using llvm-3.3 to break dependency cycle (https://trac.macports.org/ticket/52091)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # default_variants +llvm33
</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;'>- # Default to llvm 11 on macOS 11 and newer for best compatibility.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![some_llvm_variant_set] && ${os.major} >= 20} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +llvm11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we purposefully don't force an llvm variant on cctools for < darwin10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this avoids a dependency loop. Folks who really want LTO support on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # systems prior to darwin10 can reinstall cctools with an llvm variant manually
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/52091
</span>
# If default still not set, use llvm 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![some_llvm_variant_set] && ${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this a bail-out in case someone tries to install cctools with negative args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![some_llvm_variant_set] && ![variant_isset xcode] && ${os.major} >= 10} {
</span> default_variants +llvm10
}
}
</pre><pre style='margin:0'>
</pre>