<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/5a8197a8d1660a8ea2d24dc45410e1d466654256">https://github.com/macports/macports-ports/commit/5a8197a8d1660a8ea2d24dc45410e1d466654256</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5a8197a8d1660a8ea2d24dc45410e1d466654256
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Thu Mar 28 21:28:49 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> llvm-7.0: Fixup patch numbering of libdispatch patch
</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>---
lang/llvm-7.0/Portfile | 2 +-
...-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch | 26 +++++++++++-----------
... 2002-Work-around-no-libdispatch-on-10.6.patch} | 22 ++++++++++++++----
3 files changed, 32 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-7.0/Portfile b/lang/llvm-7.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c83e8a8..4a1d9a4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-7.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-7.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,10 +168,10 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> 1006-Fixup-libstdc-header-search-paths-for-older-versions.patch \
1007-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch \
2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2002-Work-around-no-libdispatch-on-10.6.patch \
</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:#ffe0e0;'>- 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;color:#808080;'>diff --git a/lang/llvm-7.0/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch b/lang/llvm-7.0/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 9330bbb..9c00481 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-7.0/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-7.0/files/2001-xray-Define-O_CLOEXEC-for-older-SDKs-that-don-t-have.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 585a864b88b65cfbe57765d769b92b771bfaf762 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7c0ed4903bda85727781bf383ec3b31e86a1b562 Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Wed, 27 Dec 2017 23:21:37 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2001/2001] xray: Define O_CLOEXEC for older SDKs that don't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2001/2002] xray: Define O_CLOEXEC for older SDKs that don't
</span> have it
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,10 +10,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> lib/xray/xray_x86_64.cc | 6 ++++++
2 files changed, 12 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/projects/compiler-rt/lib/xray/xray_utils.cc macports_master/projects/compiler-rt/lib/xray/xray_utils.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b9a38d1b9..b26a76893 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/projects/compiler-rt/lib/xray/xray_utils.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/projects/compiler-rt/lib/xray/xray_utils.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_70/projects/compiler-rt/lib/xray/xray_utils.cc macports_release_70/projects/compiler-rt/lib/xray/xray_utils.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 68f4e8c10..cbf27dc96 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_70/projects/compiler-rt/lib/xray/xray_utils.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_70/projects/compiler-rt/lib/xray/xray_utils.cc
</span> @@ -25,6 +25,12 @@
#include <unistd.h>
#include <utility>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +27,11 @@ index b9a38d1b9..b26a76893 100644
</span> namespace __xray {
void printToStdErr(const char *Buffer) XRAY_NEVER_INSTRUMENT {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_master/projects/compiler-rt/lib/xray/xray_x86_64.cc macports_master/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e34806fa1..74ac35e47 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_master/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_master/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,6 +12,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_70/projects/compiler-rt/lib/xray/xray_x86_64.cc macports_release_70/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 51dc4ce43..ea5a70d9f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_70/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_70/projects/compiler-rt/lib/xray/xray_x86_64.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,12 @@
</span> #include <tuple>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ index e34806fa1..74ac35e47 100644
</span> +
namespace __xray {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- static std::pair<ssize_t, bool>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if SANITIZER_LINUX
</span> --
<span style='display:block; white-space:pre;background:#ffe0e0;'>-2.15.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.20.1 (Apple Git-116)
</span>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-7.0/files/3004-compiler-rt-leopard-no-libdispatch.patch b/lang/llvm-7.0/files/2002-Work-around-no-libdispatch-on-10.6.patch
</span>similarity index 66%
rename from lang/llvm-7.0/files/3004-compiler-rt-leopard-no-libdispatch.patch
rename to lang/llvm-7.0/files/2002-Work-around-no-libdispatch-on-10.6.patch
<span style='display:block; white-space:pre;color:#808080;'>index 1b0c87f..df60492 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-7.0/files/3004-compiler-rt-leopard-no-libdispatch.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-7.0/files/2002-Work-around-no-libdispatch-on-10.6.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/projects/compiler-rt/lib/builtins/os_version_check.c.orig 2018-06-18 19:56:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/projects/compiler-rt/lib/builtins/os_version_check.c 2018-11-27 23:41:04.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f56ae52a02e81210e7d961774faa7e35795c2bcb Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Ken Cunningham <kencu@macports.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 28 Mar 2019 21:26:26 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2002/2002] Work around no libdispatch on < 10.6
</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;'>+ lib/builtins/os_version_check.c | 19 ++++++++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 18 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_release_70/projects/compiler-rt/lib/builtins/os_version_check.c macports_release_70/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 772e33333..5f9180426 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_release_70/projects/compiler-rt/lib/builtins/os_version_check.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_release_70/projects/compiler-rt/lib/builtins/os_version_check.c
</span> @@ -15,9 +15,12 @@
#ifdef __APPLE__
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +41,7 @@
</span>
typedef CFDataRef (*CFDataCreateWithBytesNoCopyFuncTy)(CFAllocatorRef,
const UInt8 *, CFIndex,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,7 +190,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,7 +191,13 @@ Fail:
</span>
int32_t __isOSVersionAtLeast(int32_t Major, int32_t Minor, int32_t Subminor) {
/* Populate the global version variables, if they haven't already. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +49,12 @@
</span> dispatch_once_f(&DispatchOnceCounter, NULL, parseSystemVersionPList);
+#else
+ /* expensive procedure, only do once. GlobalMajor will not be 0 once run. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (GlobalMajor == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (GlobalMajor == 0)
</span> + parseSystemVersionPList(NULL);
+#endif
if (Major < GlobalMajor)
return 1;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>