<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/2ecf7c5df88d0a230c12edbfcaa7fa458423b674">https://github.com/macports/macports-ports/commit/2ecf7c5df88d0a230c12edbfcaa7fa458423b674</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 2ecf7c5 cctools: Add xcode variant that installs wrapper scripts that use xcrun to run the Xcode provided utilities
</span>2ecf7c5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2ecf7c5df88d0a230c12edbfcaa7fa458423b674
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Jul 24 14:03:27 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> cctools: Add xcode variant that installs wrapper scripts that use xcrun to run the Xcode provided utilities
</span>---
devel/cctools/Portfile | 225 +++++++++++++++++++++++++++++--------------------
1 file changed, 133 insertions(+), 92 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 39d4e72..fa4dbfa 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;'>@@ -28,8 +28,6 @@ checksums ld64-274.1.tar.gz \
</span> rmd160 e46dd79bd87c727f1326c569d0b8e9eadcc57495 \
sha256 ce66034fa35117f9ae76bbb7dd72d8068c405778fa42e877e8a13237a10c5cb7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:libunwind-headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles \
cctools-829-lto.patch \
PR-37520.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +56,7 @@ set llvm_version {}
</span>
foreach variantname $all_llvm_variants {
set this_llvm_version $llvm_variant_version($variantname)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant $variantname conflicts {*}[ldelete $all_llvm_variants $variantname] description "Use llvm-${this_llvm_version} for libLTO, llvm-mc, llvm-size, and llvm-nm" "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant $variantname conflicts xcode {*}[ldelete $all_llvm_variants $variantname] description "Use llvm-${this_llvm_version} for libLTO, llvm-mc, llvm-size, and llvm-nm" "
</span> set llvm_version $this_llvm_version
depends_lib-append port:llvm-${this_llvm_version}
"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +72,7 @@ proc some_llvm_variant_set {} {
</span> return no
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![some_llvm_variant_set]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ![some_llvm_variant_set] && ![variant_isset xcode] } {
</span> if {${os.major} == 12 || ${os.major} == 13} {
# 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:#e0e0e0;'>@@ -88,45 +86,82 @@ if {![some_llvm_variant_set]} {
</span> # default_variants +llvm33
# }
<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;'>+ if {[vercmp $xcodeversion 9.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +xcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {![some_llvm_variant_set] && ${os.major} >= 10} {
</span> default_variants +llvm50
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant xcode description "Use Xcode supplied toolkit" { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset xcode]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-destroot { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set xcode_cmds {bitcode-strip nm nm-classic as ar otool ranlib lipo libtool segedit strip size size-classic strings}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach xcode_cmd $xcode_cmds {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mp_cmd ${destroot}${prefix}/bin/${xcode_cmd}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create script that uses xcrun to run the Xcode provided command
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo '#!/bin/bash' > ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'if \[\[ \-x \/usr\/bin\/xcrun \]\] \; then' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo ' exec \/usr\/bin\/xcrun ${xcode_cmd} \"\$\{\@\}\"' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'elif \[\[ \-x \/usr\/bin\/${xcode_cmd} \]\] \; then' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo ' exec \/usr\/bin/${xcode_cmd} \"\$\{\@\}\"' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'else' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo ' exec ${xcode_cmd} \"\$\{\@\}\"' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "echo 'fi' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "chmod +x ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
use_configure no
destroot.args RAW_DSTROOT=${destroot} DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/../ld64-${ld64_version}/src/other/PruneTrie.cpp ${worksrcpath}/misc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "touch ${worksrcpath}/../ld64-${ld64_version}/src/abstraction/configure.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset xcode]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:libunwind-headers
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We don't want to build cctools ld. We want to use ld64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/^SUBDIRS_32/s/ld//" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "/^COMMON_SUBDIRS/s/ ld / /" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use our chosen version of llvm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${llvm_version} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:\"llvm-objdump\":\"llvm-objdump-mp-${llvm_version}\":" ${worksrcpath}/otool/main.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:\"llvm-mc\":\"llvm-mc-mp-${llvm_version}\":" ${worksrcpath}/as/driver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:@@LLVM_LIBDIR@@:${prefix}/libexec/llvm-${llvm_version}/lib:" ${worksrcpath}/libstuff/lto.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset xcode]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${worksrcpath}/../ld64-${ld64_version}/src/other/PruneTrie.cpp ${worksrcpath}/misc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "touch ${worksrcpath}/../ld64-${ld64_version}/src/abstraction/configure.h"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach file [glob ${worksrcpath}/{*/,}Makefile] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:/usr/local:@PREFIX@:g" ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:/usr:@PREFIX@:g" ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:@PREFIX@:${prefix}:g" ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:${prefix}/efi:${prefix}:g" ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:/Developer${prefix}:${prefix}:g" ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:${prefix}/man:${prefix}/share/man:g" ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Don't strip installed binaries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:\\(install .*\\)-s :\\1:g" ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s:${prefix}/bin/mig:/usr/bin/mig:g" ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset xcode]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We don't want to build cctools ld. We want to use ld64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/^SUBDIRS_32/s/ld//" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/^COMMON_SUBDIRS/s/ ld / /" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use our chosen version of llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${llvm_version} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:\"llvm-objdump\":\"llvm-objdump-mp-${llvm_version}\":" ${worksrcpath}/otool/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:\"llvm-mc\":\"llvm-mc-mp-${llvm_version}\":" ${worksrcpath}/as/driver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:@@LLVM_LIBDIR@@:${prefix}/libexec/llvm-${llvm_version}/lib:" ${worksrcpath}/libstuff/lto.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach file [glob ${worksrcpath}/{*/,}Makefile] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:/usr/local:@PREFIX@:g" ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:/usr:@PREFIX@:g" ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:@PREFIX@:${prefix}:g" ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:${prefix}/efi:${prefix}:g" ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:/Developer${prefix}:${prefix}:g" ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:${prefix}/man:${prefix}/share/man:g" ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Don't strip installed binaries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:\\(install .*\\)-s :\\1:g" ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s:${prefix}/bin/mig:/usr/bin/mig:g" ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,50 +181,54 @@ if {[string match *clang* ${configure.cxx}]} {
</span> configure.cppflags-append -I${worksrcpath}/../ld64-${ld64_version}/src/abstraction -I${worksrcpath}/../ld64-${ld64_version}/src/other -I${worksrcpath}/include
pre-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RC_ProjectSourceVersion=${version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_DEPENDENCY_FILE=NO \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_DYLIBS=NO \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc} ${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx} ${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXLIB="${cxx_stdlibflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TRIE=-DTRIE_SUPPORT \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RC_ARCHS="[get_canonical_archs]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDK="${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${llvm_version} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LTO=-DLTO_SUPPORT \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RC_CFLAGS="[get_canonical_archflags] `llvm-config-mp-${llvm_version} --cflags`" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LLVM_MC="llvm-mc-mp-${llvm_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LTO= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RC_CFLAGS="[get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset xcode]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RC_ProjectSourceVersion=${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_DEPENDENCY_FILE=NO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUILD_DYLIBS=NO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC="${configure.cc} ${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx} ${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXLIB="${cxx_stdlibflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TRIE=-DTRIE_SUPPORT \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RC_ARCHS="[get_canonical_archs]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDK="${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${llvm_version} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LTO=-DLTO_SUPPORT \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RC_CFLAGS="[get_canonical_archflags] `llvm-config-mp-${llvm_version} --cflags`" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LLVM_MC="llvm-mc-mp-${llvm_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LTO= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RC_CFLAGS="[get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
pre-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RC_ProjectSourceVersion=${version} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_DEPENDENCY_FILE=NO \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILD_DYLIBS=NO \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cc} ${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx} ${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXLIB="${cxx_stdlibflags}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TRIE=-DTRIE_SUPPORT \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RC_ARCHS="[get_canonical_archs]" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDK="${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${llvm_version} ne ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LTO=-DLTO_SUPPORT \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RC_CFLAGS="[get_canonical_archflags] `llvm-config-mp-${llvm_version} --cflags`" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LLVM_MC="llvm-mc-mp-${llvm_version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset xcode]} {
</span> destroot.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LTO= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RC_CFLAGS="[get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RC_ProjectSourceVersion=${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_DEPENDENCY_FILE=NO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BUILD_DYLIBS=NO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC="${configure.cc} ${configure.cflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx} ${configure.cxxflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXLIB="${cxx_stdlibflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TRIE=-DTRIE_SUPPORT \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RC_ARCHS="[get_canonical_archs]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SDK="${configure.cppflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${llvm_version} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LTO=-DLTO_SUPPORT \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RC_CFLAGS="[get_canonical_archflags] `llvm-config-mp-${llvm_version} --cflags`" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LLVM_MC="llvm-mc-mp-${llvm_version}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LTO= \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RC_CFLAGS="[get_canonical_archflags]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -201,32 +240,34 @@ platform macosx {
</span> destroot.target install_tools
destroot.args-append DSTROOT=${destroot}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/OpenSourceLicenses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/OpenSourceVersions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/RelNotes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset xcode]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/OpenSourceLicenses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/OpenSourceVersions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/RelNotes
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}/Developer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}/Developer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Provided by port:cctools-headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Provided by port:cctools-headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/include
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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;'>+ # Older versions of llvm either don't have some tools, or they're not compatible
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/bin/nm
</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 {${llvm_version} eq "3.4" || ${llvm_version} eq "3.7" || ${llvm_version} eq ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s nm-classic ${destroot}${prefix}/bin/nm
</span><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;'>+ file delete -force ${destroot}${prefix}/bin/nm
</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.4" || ${llvm_version} eq "3.7" || ${llvm_version} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s nm-classic ${destroot}${prefix}/bin/nm
</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;'>- # https://trac.macports.org/ticket/53099
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/bin/otool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destroot}${prefix}/bin/llvm-otool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s otool-classic ${destroot}${prefix}/bin/otool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</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;'>- 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>