<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/10cc977fe3cfc8837a30b0bff544a70f3418a4fe">https://github.com/macports/macports-ports/commit/10cc977fe3cfc8837a30b0bff544a70f3418a4fe</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 10cc977 cctools: Don't use llvm-otool with older llvm versions
</span>10cc977 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 10cc977fe3cfc8837a30b0bff544a70f3418a4fe
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Sun Dec 18 12:53:41 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> cctools: Don't use llvm-otool with older llvm versions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/53099
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
devel/cctools/Portfile | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 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 94bdd88..52f9bd5 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;'>@@ -5,7 +5,7 @@ PortSystem 1.0
</span> name cctools
# Xcode 8.1
version 895
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set ld64_version 274.1
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -88,14 +88,6 @@ if {![some_llvm_variant_set]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set has_llvm_nm true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set has_llvm_size true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${llvm_version} eq "3.3" || ${llvm_version} eq "3.4" || ${llvm_version} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set has_llvm_nm false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set has_llvm_size false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_configure no
destroot.args RAW_DSTROOT=${destroot} DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,18 +207,21 @@ post-destroot {
</span> # Provided by port:cctools-headers
file delete -force ${destroot}${prefix}/include
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Older versions of llvm either don't have some tools, or they're not compatible
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> file delete -force ${destroot}${prefix}/bin/nm
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${has_llvm_nm}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s llvm-nm-mp-${llvm_version} ${destroot}${prefix}/bin/nm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/bin/size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${llvm_version} eq "3.3" || ${llvm_version} eq "3.4" || ${llvm_version} eq ""} {
</span> ln -s nm-classic ${destroot}${prefix}/bin/nm
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s size-classic ${destroot}${prefix}/bin/size
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/bin/size
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${has_llvm_size}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s llvm-size-mp-${llvm_version} ${destroot}${prefix}/bin/size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/53099
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/bin/otool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/bin/llvm-otool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s otool-classic ${destroot}${prefix}/bin/otool
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s size-classic ${destroot}${prefix}/bin/size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s llvm-nm-mp-${llvm_version} ${destroot}${prefix}/bin/nm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s llvm-size-mp-${llvm_version} ${destroot}${prefix}/bin/size
</span> }
}
</pre><pre style='margin:0'>
</pre>