<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/69622c8e23866d834eae8ebf09d09112edae7992">https://github.com/macports/macports-ports/commit/69622c8e23866d834eae8ebf09d09112edae7992</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 69622c8 cctools: Fix whitespace
</span>69622c8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 69622c8e23866d834eae8ebf09d09112edae7992
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Aug 30 17:30:51 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> cctools: Fix whitespace
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Change tabs to spaces, remove trailing whitespace, and try to make the
</span><span style='display:block; white-space:pre;color:#404040;'> indentation more consistent.
</span>---
devel/cctools/Portfile | 141 +++++++++++++++++++++++++------------------------
1 file changed, 71 insertions(+), 70 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 05aa0c3..9dcdc55 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;'>@@ -30,15 +30,14 @@ checksums ld64-274.1.tar.gz \
</span> rmd160 e46dd79bd87c727f1326c569d0b8e9eadcc57495 \
sha256 ce66034fa35117f9ae76bbb7dd72d8068c405778fa42e877e8a13237a10c5cb7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-829-lto.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-37520.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-839-static-dis_info.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PR-12400897.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-862-prunetrie.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-895-big_endian.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cctools-895-OFILE_LLVM_BITCODE.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- not-clang.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles cctools-829-lto.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PR-37520.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-839-static-dis_info.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PR-12400897.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-862-prunetrie.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-895-big_endian.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cctools-895-OFILE_LLVM_BITCODE.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ not-clang.patch
</span>
if {${os.major} < 11} {
patchfiles-append snowleopard-strnlen.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +71,7 @@ if {[vercmp $xcodeversion 9.0] >= 0} {
</span> default_variants -${variantname}
set variations(${variantname}) -
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
proc some_llvm_variant_set {} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,98 +103,100 @@ if { ![some_llvm_variant_set] && ![variant_isset xcode] } {
</span> } elseif {![some_llvm_variant_set] && ${os.major} >= 10} {
default_variants +llvm50
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> }
variant xcode conflicts universal description "Use Xcode supplied toolkit" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set xcode_cmds {bitcode-strip nm nm-classic as ar otool ranlib lipo libtool segedit strip size size-classic strings objdump}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach xcode_cmd $xcode_cmds {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set mp_cmd ${destroot}${prefix}/bin/${xcode_cmd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create script that uses xcrun to run the Xcode provided command
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo '#!/bin/bash' > ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'if \[\[ \-x \/usr\/bin\/xcrun \]\] \; then' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo ' exec \/usr\/bin\/xcrun ${xcode_cmd} \"\$\{\@\}\"' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'elif \[\[ \-x \/usr\/bin\/${xcode_cmd} \]\] \; then' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo ' exec \/usr\/bin/${xcode_cmd} \"\$\{\@\}\"' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'else' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo ' exec ${xcode_cmd} \"\$\{\@\}\"' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'fi' >> ${mp_cmd}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make executable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod +x ${mp_cmd}"
</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:#e0ffe0;'>+ supported_archs noarch
</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;'>+ 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 objdump}
</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> }
destroot.args RAW_DSTROOT=${destroot} DSTROOT=${destroot}${prefix} RC_ProjectSourceVersion=${version}
if {![variant_isset xcode]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build port:libunwind-headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build port:libunwind-headers
</span> variant universal conflicts xcode {}
}
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset xcode]} {
</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;'>+ 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> }
}
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset xcode]} {
</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:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#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> reinplace "s:${prefix}/bin/mig:/usr/bin/mig:g" ${file}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build yes
</span>
# https://trac.macports.org/ticket/43745
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cflags-append -std=gnu99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -std=gnu99
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target all
</span>
set cxx_stdlibflags {}
if {[string match *clang* ${configure.cxx}]} {
set cxx_stdlibflags -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags-append -I${worksrcpath}/../ld64-${ld64_version}/src/abstraction -I${worksrcpath}/../ld64-${ld64_version}/src/other -I${worksrcpath}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${worksrcpath}/../ld64-${ld64_version}/src/abstraction \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${worksrcpath}/../ld64-${ld64_version}/src/other \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${worksrcpath}/include
</span>
pre-build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset xcode]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append \
</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> RC_ProjectSourceVersion=${version} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_DEPENDENCY_FILE=NO \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ USE_DEPENDENCY_FILE=NO \
</span> BUILD_DYLIBS=NO \
CC="${configure.cc} ${configure.cflags}" \
CXX="${configure.cxx} ${configure.cxxflags}" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -239,7 +240,7 @@ pre-destroot {
</span> destroot.args-append \
LTO= \
RC_CFLAGS="[get_canonical_archflags]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>