<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/c35b1701f54cb5a048f8821641d8ecdf524bf989">https://github.com/macports/macports-ports/commit/c35b1701f54cb5a048f8821641d8ecdf524bf989</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 c35b170 clang-6.0: fix build on leopard Intel
</span>c35b170 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c35b1701f54cb5a048f8821641d8ecdf524bf989
</span>Author: System Administrator <kencu@macports.org>
AuthorDate: Tue Nov 27 23:07:35 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> clang-6.0: fix build on leopard Intel
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> work around compiler_rt build error due to
</span><span style='display:block; white-space:pre;color:#404040;'> no libdispatch on Leopard
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> disables santizer_common which presently doesn't build on Leopard
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add fallback to clang-3.7 and clang-3.9
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/55444
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/57694
</span>---
lang/llvm-6.0/Portfile | 8 ++++
.../3004-compiler-rt-leopard-no-libdispatch.patch | 49 ++++++++++++++++++++++
2 files changed, 57 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-6.0/Portfile b/lang/llvm-6.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49d7fa2..7236589 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-6.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-6.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -169,6 +169,7 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 3001-Fix-local-and-iterator-when-building-with-Lion-and-n.patch \
3002-Fix-missing-long-long-math-prototypes-when-using-the.patch \
3003-implement-atomic-using-mutex-lock_guard-for-64b-ops-.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3004-compiler-rt-leopard-no-libdispatch.patch \
</span> openmp-locations.patch
# https://llvm.org/bugs/show_bug.cgi?id=25681
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -273,6 +274,12 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> configure.args-append \
-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} <= 9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # xray calls in sanitizer_common, which presently
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # does not build on < SnowLeopard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCOMPILER_RT_BUILD_XRAY=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } elseif {${subport} eq "lldb-${llvm_version}"} {
#select.group lldb
#select.file ${filespath}/mp-${subport}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -297,6 +304,7 @@ if {${subport} eq "llvm-${llvm_version}"} {
</span> # Xcode 5.1's clang (clang-503.0.40) has codegen issues (resulting compiler crashes)
# Xcode 6.2's clang (600.0.57) fails due to https://llvm.org/bugs/show_bug.cgi?id=25753
compiler.blacklist *gcc* {clang < 602}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.fallback-append macports-clang-3.7 macports-clang-3.9
</span>
if {${subport} eq "clang-${llvm_version}"} {
# clang older than 3.5 fail due to https://llvm.org/bugs/show_bug.cgi?id=25753
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-6.0/files/3004-compiler-rt-leopard-no-libdispatch.patch b/lang/llvm-6.0/files/3004-compiler-rt-leopard-no-libdispatch.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..afbb0f0
</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-6.0/files/3004-compiler-rt-leopard-no-libdispatch.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/projects/compiler-rt/lib/builtins/os_version_check.c b/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 74ade2f5..709ea687 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,8 +15,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <dispatch/dispatch.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <dispatch/dispatch.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <TargetConditionals.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <dlfcn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +29,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* These three variables hold the host's OS version. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int32_t GlobalMajor, GlobalMinor, GlobalSubminor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static dispatch_once_t DispatchOnceCounter;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static dispatch_once_t DispatchOnceCounter;
</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;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* declare a missing reference not found in SDK < 10.6 for function called below */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++typedef struct __CFError * CFErrorRef;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern CFPropertyListRef CFPropertyListCreateWithData(CFAllocatorRef, CFDataRef, CFOptionFlags, CFPropertyListFormat *, CFErrorRef *);
</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;'>+ /* Find and parse the SystemVersion.plist file. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void parseSystemVersionPList(void *Unused) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -161,8 +171,13 @@ Fail:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int32_t __isOSVersionAtLeast(int32_t Major, int32_t Minor, int32_t Subminor) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Populate the global version variables, if they haven't already. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dispatch_once_f(&DispatchOnceCounter, NULL, parseSystemVersionPList);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* expensive procedure, only do once. GlobalMajor will not be 0 once run. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (GlobalMajor == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ parseSystemVersionPList(NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Major < GlobalMajor) return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Major > GlobalMajor) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (Minor < GlobalMinor) return 1;
</span></pre><pre style='margin:0'>
</pre>