<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/483f64a72ba5c789ac698979e4d1526285771183">https://github.com/macports/macports-ports/commit/483f64a72ba5c789ac698979e4d1526285771183</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 483f64a clang-8.0/devel : fix build on older systems
</span>483f64a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 483f64a72ba5c789ac698979e4d1526285771183
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Mar 31 21:02:33 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> clang-8.0/devel : fix build on older systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> update stale patches
</span><span style='display:block; white-space:pre;color:#404040;'> add additional patch to re-enable clang-8.0 on < 10.7
</span>---
lang/llvm-8.0/Portfile | 3 +-
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 40 +++++++++++++++++-----
.../patch-libcxx-cmakelists-reenable-10.6.8.diff | 12 +++++++
...ssues-pre-Lion-due-to-missing-a-strnlen-d.patch | 40 +++++++++++++++++-----
lang/llvm-devel/files/yosemite-no-clangd.patch | 8 ++---
5 files changed, 80 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-8.0/Portfile b/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fc282a..142bd9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-8.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,7 +171,8 @@ 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:#ffe0e0;'>- openmp-locations.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openmp-locations.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libcxx-cmakelists-reenable-10.6.8.diff
</span>
# https://llvm.org/bugs/show_bug.cgi?id=25681
if {${worksrcdir} eq "trunk" || ${worksrcdir} eq "release_${llvm_version_no_dot}"} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-8.0/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch b/lang/llvm-8.0/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 044d515..f79fe59 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-8.0/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-8.0/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1340c81077b70dce5ec0522986411f0d592795fd Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 129be7902cc13ee305724cd4e115b3a21d376fce Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Dec 2016 12:41:21 -0800
Subject: [PATCH 4/4] Fix build issues pre-Lion due to missing a strnlen
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,10 +13,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> tools/obj2yaml/macho2yaml.cpp | 16 +++++++++++++++-
2 files changed, 29 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/lib/ObjectYAML/MachOYAML.cpp macports_release_80/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/lib/ObjectYAML/MachOYAML.cpp macports_master/lib/ObjectYAML/MachOYAML.cpp
</span> index e00a4ea9307..0daba44573c 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/lib/ObjectYAML/MachOYAML.cpp
</span> @@ -22,6 +22,20 @@
#include <cstdint>
#include <cstring>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,10 +38,10 @@ index e00a4ea9307..0daba44573c 100644
</span> namespace llvm {
MachOYAML::LoadCommand::~LoadCommand() = default;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/obj2yaml/macho2yaml.cpp macports_release_80/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/obj2yaml/macho2yaml.cpp macports_master/tools/obj2yaml/macho2yaml.cpp
</span> index fa81ce974ec..1e86f820437 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/obj2yaml/macho2yaml.cpp
</span> @@ -15,7 +15,21 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/LEB128.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +65,28 @@ index fa81ce974ec..1e86f820437 100644
</span>
using namespace llvm;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tools/llvm-readobj/ObjDumper.cpp.orig 2018-09-03 23:25:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tools/llvm-readobj/ObjDumper.cpp 2018-09-03 23:26:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ObjDumper::~ObjDumper() {
</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;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ l++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ static void printAsPrintable(raw_ostream &W, const uint8_t *Start, size_t Len) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (size_t i = 0; i < Len; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ W << (isPrint(Start[i]) ? static_cast<char>(Start[i]) : '.');
</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-8.0/files/patch-libcxx-cmakelists-reenable-10.6.8.diff b/lang/llvm-8.0/files/patch-libcxx-cmakelists-reenable-10.6.8.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3b1a3a4
</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-8.0/files/patch-libcxx-cmakelists-reenable-10.6.8.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/projects/libcxx/lib/CMakeLists.txt.orig 2019-03-30 20:06:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/projects/libcxx/lib/CMakeLists.txt 2019-03-30 20:07:28.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,9 +149,6 @@
</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 ( CMAKE_OSX_DEPLOYMENT_TARGET STREQUAL "10.6" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "Mac OSX 10.6 is not supported anymore as a deployment "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "target. If you need support for this, please contact "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "the libc++ maintainers.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ("armv7" IN_LIST CMAKE_OSX_ARCHITECTURES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(RE_EXPORT_LIST "${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch b/lang/llvm-devel/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 044d515..f79fe59 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1340c81077b70dce5ec0522986411f0d592795fd Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 129be7902cc13ee305724cd4e115b3a21d376fce Mon Sep 17 00:00:00 2001
</span> From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 20 Dec 2016 12:41:21 -0800
Subject: [PATCH 4/4] Fix build issues pre-Lion due to missing a strnlen
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,10 +13,10 @@ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
</span> tools/obj2yaml/macho2yaml.cpp | 16 +++++++++++++++-
2 files changed, 29 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/lib/ObjectYAML/MachOYAML.cpp macports_release_80/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/lib/ObjectYAML/MachOYAML.cpp macports_master/lib/ObjectYAML/MachOYAML.cpp
</span> index e00a4ea9307..0daba44573c 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/lib/ObjectYAML/MachOYAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/lib/ObjectYAML/MachOYAML.cpp
</span> @@ -22,6 +22,20 @@
#include <cstdint>
#include <cstring>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,10 +38,10 @@ index e00a4ea9307..0daba44573c 100644
</span> namespace llvm {
MachOYAML::LoadCommand::~LoadCommand() = default;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git llvm_release_80/tools/obj2yaml/macho2yaml.cpp macports_release_80/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git llvm_master/tools/obj2yaml/macho2yaml.cpp macports_master/tools/obj2yaml/macho2yaml.cpp
</span> index fa81ce974ec..1e86f820437 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm_release_80/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ macports_release_80/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- llvm_master/tools/obj2yaml/macho2yaml.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ macports_master/tools/obj2yaml/macho2yaml.cpp
</span> @@ -15,7 +15,21 @@
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/LEB128.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +65,28 @@ index fa81ce974ec..1e86f820437 100644
</span>
using namespace llvm;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.20.1 (Apple Git-116)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/tools/llvm-readobj/ObjDumper.cpp.orig 2018-09-03 23:25:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/tools/llvm-readobj/ObjDumper.cpp 2018-09-03 23:26:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ObjDumper::~ObjDumper() {
</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;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ l++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s++;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return l;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</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;'>+ static void printAsPrintable(raw_ostream &W, const uint8_t *Start, size_t Len) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (size_t i = 0; i < Len; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ W << (isPrint(Start[i]) ? static_cast<char>(Start[i]) : '.');
</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/yosemite-no-clangd.patch b/lang/llvm-devel/files/yosemite-no-clangd.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d34135..4ac36d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/files/yosemite-no-clangd.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/files/yosemite-no-clangd.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> --- a/tools/clang/tools/extra/CMakeLists.txt 2018-04-03 01:26:00.000000000 -0700
+++ b/tools/clang/tools/extra/CMakeLists.txt 2018-04-03 14:05:29.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,7 +10,6 @@ add_subdirectory(change-namespace)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(clang-doc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(clang-query)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(clang-include-fixer)
</span> add_subdirectory(clang-move)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(clang-query)
</span> -add_subdirectory(clangd)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(include-fixer)
</span> add_subdirectory(pp-trace)
add_subdirectory(tool-template)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>