<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/cc468baf86fcba600fceccc876f5de6dd7c4605e">https://github.com/macports/macports-ports/commit/cc468baf86fcba600fceccc876f5de6dd7c4605e</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 cc468baf86f cctools: tweak comments for clarity
</span>cc468baf86f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit cc468baf86fcba600fceccc876f5de6dd7c4605e
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Sun Dec 27 10:17:08 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> cctools: tweak comments for clarity
</span>---
devel/cctools/Portfile | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 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 7ba8fcf768a..a8c19234491 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;'>@@ -77,17 +77,16 @@ proc some_llvm_variant_set {} {
</span> }
if { ![some_llvm_variant_set] && ![variant_isset xcode] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Xcode 11 has a newer cctools than the current cctools port
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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:#ffe0e0;'>- # so we assume that Mojave and newer have a newer ld64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this test can be moved up as the cctools port is newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we can't use xcodeversion to test for xcode11 as that returns
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # none if only the CLTs are installed, so we assume that Mojave and newer use Xcode11+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this +xcode cutoff can be moved up as the cctools port is updated
</span> if {${os.major} >= 18} {
default_variants +xcode
} elseif {${os.major} >= 14} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # llvm-11 changed the arguments accepted by llvm-dump
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # llvm-11 changed the arguments accepted by llvm-objdump
</span> # this causes a number of errors in scripts that still use the old arguments
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # we will change this to llvm11 when xcode changes to require the new arguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we will default to +llvm11 when xcode changes to require the new arguments
</span> # see https://reviews.llvm.org/D92310 and https://trac.macports.org/ticket/61852
default_variants +llvm10
} elseif {${os.major} >= 12} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,12 +97,12 @@ if { ![some_llvm_variant_set] && ![variant_isset xcode] } {
</span> }
# we purposefully don't force an llvm variant on cctools for < darwin10
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # this avoids a dependency loop. Folks who really want LTO support on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to avoid a dependency loop. Folks who want LTO support on
</span> # systems prior to darwin10 can reinstall cctools with an llvm variant manually
# see https://trac.macports.org/ticket/52091
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # If default still not set, use llvm 10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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 a default llvm is still not set, use +llvm10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this fail-safe ensures some cctools variant can build
</span> if {![some_llvm_variant_set] && ![variant_isset xcode] && ${os.major} >= 10} {
default_variants +llvm10
}
</pre><pre style='margin:0'>
</pre>