<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/f0069725f4a85506a601787daf92e328db7542ae">https://github.com/macports/macports-ports/commit/f0069725f4a85506a601787daf92e328db7542ae</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 f006972 llvm/clang/lldb-devel: bump to 20200512
</span>f006972 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f0069725f4a85506a601787daf92e328db7542ae
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Fri May 15 09:02:28 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> llvm/clang/lldb-devel: bump to 20200512
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> tweak compiler blacklisting
</span><span style='display:block; white-space:pre;color:#404040;'> tweak features enabled based on build success
</span><span style='display:block; white-space:pre;color:#404040;'> add patch for missing defines needed on some systems
</span><span style='display:block; white-space:pre;color:#404040;'> tweak patches as needed
</span>---
lang/llvm-devel/Portfile | 63 ++++++++++++++--------
...-use-older-cfname-and-fix-uuid-on-leopard.diff} | 0
...-unix-path-copyfileclone-on-older-systems.diff} | 0
...ly-Prepare-clang-format-for-replacement-w.patch | 4 +-
.../files/1008-compilerrt-fuzzer-missingdefs.diff | 17 ++++++
.../1009-compilerrt-sanitizer-missingdefs.diff | 14 +++++
6 files changed, 73 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/Portfile b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 86e31de..bcc5769 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,15 @@ PortGroup legacysupport 1.0
</span> # link legacysupport statically for compilers
legacysupport.use_static yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# limit legacysupport to 10.9 for now
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# test on 10.10 to see what happens there
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# on 10.11 there is a collision with getattrlistat (that has been fixed in legacysupportdevel)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # for devel
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set llvm-commit 6d6d48add8a8fcfbc311648a1d6b1ccc6e1e8b26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set date 20200505
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm-commit d9166ad272847e246799afbb5e0c71874f83aa12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set date 20200512
</span> set llvm_version devel
# for release
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +29,9 @@ set lldb_executable_version 11
</span>
github.setup llvm llvm-project ${llvm-commit}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b148e3ea84e63534ffac75bbe031d8343b65e55d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f24a6c752717a57c11d8323dbf2cd869a436e64070cf8c8e84deee7d4fb62787 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 118617893
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c23afe6f2b423a27037afed49ac0335de3bc20c7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a51f6ade9627cef7937b7d62a782f4ce6c3bc30b9973fa03c1aa9628c4e68acd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 118871523
</span>
# for release, use ${llvm_version}
# version ${llvm_version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +114,7 @@ post-extract {
</span> file rename ${workpath}/llvm-project/clang ${worksrcpath}/tools/clang
file rename ${workpath}/llvm-project/compiler-rt ${worksrcpath}/projects/compiler-rt
file rename ${workpath}/llvm-project/libcxx ${worksrcpath}/projects/libcxx
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${workpath}/llvm-project/libcxxabi ${worksrcpath}/projects/libcxxabi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${workpath}/llvm-project/libcxxabi ${worksrcpath}/projects/libcxxabi
</span> file rename ${workpath}/llvm-project/clang-tools-extra ${worksrcpath}/tools/clang/tools/extra
} elseif {${subport} eq "lldb-${llvm_version}"} {
file rename ${workpath}/llvm-project/clang ${worksrcpath}/tools/clang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,11 +127,9 @@ patchfiles \
</span> 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \
0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
0005-Threading-Only-call-pthread_setname_np-on-SnowLeopar.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5000-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5000-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0007-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0008-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
</span>
if {${subport} eq "clang-${llvm_version}"} {
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,6 +139,8 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1004-Default-to-fragile-ObjC-runtime-when-targeting-darwi.patch \
1005-Fixup-libstdc-header-search-paths-for-older-versions.patch \
1007-Fix-float.h-to-work-on-Snow-Leopard-and-earlier.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1008-compilerrt-fuzzer-missingdefs.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1009-compilerrt-sanitizer-missingdefs.diff \
</span> 2002-Work-around-no-libdispatch-on-10.6.patch \
3001-Fix-missing-long-long-math-prototypes-when-using-the.patch \
3002-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -212,7 +217,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span>
configure.args-append \
-DLLDB_CODESIGN_IDENTITY=- \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCLANG_ENABLE_ARCMT=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLDB_ENABLE_LUA=OFF \
</span> -DCLANG_INCLUDE_TESTS=OFF \
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
-DCLANG_ENABLE_ARCMT=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,11 +226,12 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> -DLIBCXX_INSTALL_LIBRARY=OFF
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# not building with macports-clang up to 3.7 or xcode clang up to 800.0.42.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# not building with macports-clang up to 3.7
</span> # error: no type named 'type' in 'std::__1::enable_if<false, void>'; 'enable_if' cannot be used to disable this declaration
# ,typename enable_if<is_convertible<const _U1&, _T1>::value &&
# ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist *gcc* {clang < 801} macports-clang-3.*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# clang-1000.11.45.5 gives missing symbols for ZTIDu and others during libcxxabi build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist *gcc* {clang < 1001} macports-clang-3.*
</span>
# Override the normal compiler fallback list entirely since we have
# such specific requirements.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,19 +272,32 @@ platform darwin {
</span>
if {${subport} eq "clang-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # xpc.h available 10.10 https://developer.apple.com/documentation/xpc?language=objc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # toggle enabled in https://reviews.llvm.org/D59808
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DCLANGD_BUILD_XPC=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} == 14} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Building Xray forces build of sanitizer_common, even if
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # COMPILER_RT_BUILD_SANITIZERS=OFF, and this fails on 10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO: See why sanitizer_common fails on 10.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCOMPILER_RT_BUILD_XRAY=OFF
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} <= 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 14} {
</span> # We unfortunately don't have an option to just turn off tsan
# https://llvm.org/bugs/show_bug.cgi?id=27715
configure.args-append -DCOMPILER_RT_BUILD_SANITIZERS=OFF
}
if {${os.major} <= 10} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # needs thread_local_storage enabled
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants port:libcxx emulated_tls
</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;'>+ if {${os.major} <= 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # xpc.h available 10.7 but doesn't support nullable features
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # xpc.h works currently on 10.8+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # toggle enabled in https://reviews.llvm.org/D59808
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCLANGD_BUILD_XPC=OFF
</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;'>+ if {${os.major} <= 10} {
</span> # the directorywatcher code is currently 10.7+
patchfiles-append 5003-patch-no-directory-watcher-on-snowleopard.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -302,10 +321,8 @@ pre-fetch {
</span> depends_run
archive_sites
known_fail yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} is not supported on this os version at present."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error {unsupported platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} is not supported on this os version at present."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error {unsupported platform}
</span> }
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/5000-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff b/lang/llvm-devel/files/0007-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff
</span>similarity index 100%
rename from lang/llvm-devel/files/5000-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff
rename to lang/llvm-devel/files/0007-patch-llvm8-tools-dsymutil-symbolmap-use-older-cfname-and-fix-uuid-on-leopard.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/5000-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff b/lang/llvm-devel/files/0008-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
</span>similarity index 100%
rename from lang/llvm-devel/files/5000-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
rename to lang/llvm-devel/files/0008-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch b/lang/llvm-devel/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 30e782c..b0dfd85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1001-MacPorts-Only-Prepare-clang-format-for-replacement-w.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,8 +32,8 @@ index 3ba0abefc9..d67e3733bd 100755
</span> +++ macports_master/tools/clang/tools/clang-format/clang-format-diff.py
@@ -58,7 +58,7 @@ def main():
parser.add_argument('-style',
<span style='display:block; white-space:pre;background:#ffe0e0;'>- help='formatting style to apply (LLVM, Google, Chromium, '
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'Mozilla, WebKit)')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ help='formatting style to apply (LLVM, GNU, Google, Chromium, '
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'Microsoft, Mozilla, WebKit)')
</span> - parser.add_argument('-binary', default='clang-format',
+ parser.add_argument('-binary', default='@CLANG_FORMAT_PATH@',
help='location of binary to use for clang-format')
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1008-compilerrt-fuzzer-missingdefs.diff b/lang/llvm-devel/files/1008-compilerrt-fuzzer-missingdefs.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..808b7a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1008-compilerrt-fuzzer-missingdefs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm/projects/compiler-rt/lib/fuzzer/FuzzerUtilDarwin.cpp.orig 2020-05-14 15:23:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm/projects/compiler-rt/lib/fuzzer/FuzzerUtilDarwin.cpp 2020-05-14 15:31:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/wait.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// add definition missing on older systems
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef POSIX_SPAWN_SETSIGMASK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POSIX_SPAWN_SETSIGMASK 0x0008
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef POSIX_SPAWN_SETSIGDEF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POSIX_SPAWN_SETSIGDEF 0x0004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // There is no header for this on macOS so declare here
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern "C" char **environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/1009-compilerrt-sanitizer-missingdefs.diff b/lang/llvm-devel/files/1009-compilerrt-sanitizer-missingdefs.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b7420d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/1009-compilerrt-sanitizer-missingdefs.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp.orig 2020-05-14 15:13:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ llvm/projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cpp 2020-05-14 15:17:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,6 +111,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define VM_MEMORY_SANITIZER 99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// From <sys/spawn.h> but not in some SDKs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef POSIX_SPAWN_CLOEXEC_DEFAULT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define POSIX_SPAWN_CLOEXEC_DEFAULT 0x4000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // XNU on Darwin provides a mmap flag that optimizes allocation/deallocation of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // giant memory regions (i.e. shadow memory regions).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define kXnuFastMmapFd 0x4
</span></pre><pre style='margin:0'>
</pre>