<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/9236557f739f3bd37d902832bbca187dd9df8d2b">https://github.com/macports/macports-ports/commit/9236557f739f3bd37d902832bbca187dd9df8d2b</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 9236557 llvm-devel; clang-devel: fix build on older systems
</span>9236557 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9236557f739f3bd37d902832bbca187dd9df8d2b
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Thu Jul 11 18:38:15 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> llvm-devel; clang-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;'> remove yosemite-no-clangd patch and replace with cmake toggle
</span><span style='display:block; white-space:pre;color:#404040;'> add strnlen to two more files that use it now
</span><span style='display:block; white-space:pre;color:#404040;'> add missing definition for copyfile_clone if needed
</span>---
lang/llvm-devel/Portfile | 10 +++++++---
...t-unix-path-copyfileclone-on-older-systems.diff | 14 +++++++++++++
.../files/5001-patch-machoreader-strnlen.diff | 23 ++++++++++++++++++++++
.../files/5002-patch-objdumper-strnlen.diff | 23 ++++++++++++++++++++++
lang/llvm-devel/files/yosemite-no-clangd.patch | 10 ----------
5 files changed, 67 insertions(+), 13 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 27b30a2..2380c39 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;'>@@ -126,7 +126,9 @@ patchfiles \
</span> 0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \
0004-Fix-build-issues-pre-Lion-due-to-missing-a-strnlen-d.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:#e0ffe0;'>+ 0006-Only-call-setpriority-PRIO_DARWIN_THREAD-0-PRIO_DARW.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5001-patch-machoreader-strnlen.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5002-patch-objdumper-strnlen.diff
</span>
if {${subport} eq "clang-${llvm_version}"} {
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +143,9 @@ if {${subport} eq "clang-${llvm_version}"} {
</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:#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;'>+ 5000-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;background:#e0e0e0;'>@@ -367,7 +371,7 @@ platform darwin {
</span> }
if {${subport} eq "clang-${llvm_version}" && ${os.major} <= 14} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append yosemite-no-clangd.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DCLANG_ENABLE_CLANGD=OFF
</span> }
if {${os.major} < 11} {
<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/5000-patch-lib-support-unix-path-copyfileclone-on-older-systems.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..42a7e1b
</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/5000-patch-lib-support-unix-path-copyfileclone-on-older-systems.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;'>+diff --git trunk/lib/Support/Unix/Path.inc.orig trunk/lib/Support/Unix/Path.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c64c0df..aaa2226 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- trunk/lib/Support/Unix/Path.inc.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ trunk/lib/Support/Unix/Path.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach-o/dyld.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/attr.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <copyfile.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef COPYFILE_CLONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define COPYFILE_CLONE (1<<24)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__DragonFly__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/mount.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/5001-patch-machoreader-strnlen.diff b/lang/llvm-devel/files/5001-patch-machoreader-strnlen.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5bb0884
</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/5001-patch-machoreader-strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- trunk/tools/llvm-objcopy/MachO/MachOReader.cpp.orig 2019-07-11 18:32:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ trunk/tools/llvm-objcopy/MachO/MachOReader.cpp 2019-07-11 18:33:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,6 +13,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Object/MachO.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <memory>
</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;'>+ namespace llvm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace objcopy {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ namespace macho {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/files/5002-patch-objdumper-strnlen.diff b/lang/llvm-devel/files/5002-patch-objdumper-strnlen.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..14a72e0
</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/5002-patch-objdumper-strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- trunk/tools/llvm-readobj/ObjDumper.cpp.orig 2019-07-11 18:34:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ trunk/tools/llvm-readobj/ObjDumper.cpp 2019-07-11 18:34:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/raw_ostream.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <map>
</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;'>+ namespace llvm {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ObjDumper::ObjDumper(ScopedPrinter &Writer) : W(Writer) {}
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4ac36d2..0000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/clang/tools/extra/CMakeLists.txt 2018-04-03 01:26:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/clang/tools/extra/CMakeLists.txt 2018-04-03 14:05:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(clang-include-fixer)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(clang-move)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(clang-query)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--add_subdirectory(clangd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(pp-trace)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(tool-template)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>