<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9d2091e28e6c96938163df0409560f0072b8d6dd">https://github.com/macports/macports-ports/commit/9d2091e28e6c96938163df0409560f0072b8d6dd</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 9d2091e28e6 libtapi: fix build on macOS 10.5
</span>9d2091e28e6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9d2091e28e6c96938163df0409560f0072b8d6dd
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Sep 2 10:40:37 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> libtapi: fix build on macOS 10.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It also introduce a shortcut via clang-11-bootstrap for macOS before
</span><span style='display:block; white-space:pre;color:#404040;'> 10.12 which was the first macOS that can build it by its toolchain.
</span>---
devel/libtapi/Portfile | 33 +++++++++++-----------
.../libtapi/files/optional-pthread_setname_np.diff | 15 ++++++++++
.../files/patch-0004-tapi-add-PPC-support.diff | 28 ------------------
devel/libtapi/files/patch-lexer.diff | 11 --------
4 files changed, 31 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/Portfile b/devel/libtapi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b278a9970c..6cdb6c29fa9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libtapi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,15 +3,16 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup clang_dependency 1.0
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup tpoechtrager apple-libtapi 664b84
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup tpoechtrager apple-libtapi b7b5bdbfda9e8062d405b48da3b811afad98ae76
</span> name libtapi
version 1100.0.11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@catap korins.ky:kirill} openmaintainer
</span>
license APSL-2
description ${name} adds ld64 linker support for text-based API libraries.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +20,9 @@ long_description ${description} Newer MacOS SDKs contain only these TAPI
</span>
homepage http://opensource.apple.com/source/tapi/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cbd3719ff2a33d4f5d738e0c89c5c194b05e0dee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f2c3b3e467814b45d4afc768e4eb94b591dbfb24e086724f6b9a9c4c05793861 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 32204487
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a99aa279e626d4d638281ef9555d9b5db5f15145 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 66c715baaea6f28e8c079f36189027a52744138c38e83e97aeb399232365138f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32205809
</span>
platform darwin {
# pick a suitable python to build with
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,6 +92,9 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> depends_build-replace path:bin/cmake:cmake port:cmake-bootstrap
configure.cmd ${prefix}/libexec/cmake-bootstrap/bin/cmake
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx_stdlib libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libcxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Proxy for eliminating the dependency on native TLS
# http://trac.macports.org/ticket/46887
configure.args-append -DLLVM_ENABLE_BACKTRACES=OFF
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,26 +103,21 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> configure.cxxflags-append -U__STRICT_ANSI__
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# add support for PPC architectures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0004-tapi-add-PPC-support.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} in "ppc ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix a bug in Lexer.cpp, see https://systems.nic.uoregon.edu/internal-wiki/index.php?title=Tau_clang_plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-lexer.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # add a missing strnlen definition if needed
patchfiles-append patch-0006-strnlen.diff
# build manpages for tapi
patchfiles-append patch-0007-build-manpages-for-tapi.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# don't try to call pthread_setname_np on 10.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append optional-pthread_setname_np.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.post_args ${worksrcpath}/src/llvm
# needed for libtapi to find some required files
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DCMAKE_CXX_FLAGS="-I ${worksrcpath}/src/llvm/projects/clang/include -I ${workpath}/build/projects/clang/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${worksrcpath}/src/llvm/projects/clang/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${workpath}/build/projects/clang/include
</span>
configure.args-append -DLLVM_INCLUDE_TESTS=OFF \
-DTAPI_INCLUDE_DOCS=ON
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/files/optional-pthread_setname_np.diff b/devel/libtapi/files/optional-pthread_setname_np.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8994f691fbc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libtapi/files/optional-pthread_setname_np.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/llvm/lib/Support/Unix/Threading.inc b/src/llvm/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2d49ce1ad..9c9e98b81 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/llvm/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/llvm/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -154,8 +154,10 @@ void llvm::set_thread_name(const Twine &Name) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ::pthread_setname_np(::pthread_self(), "%s",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const_cast<char *>(NameStr.data()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_PTHREAD_SETNAME_NP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ::pthread_setname_np(NameStr.data());
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void llvm::get_thread_name(SmallVectorImpl<char> &Name) {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/files/patch-0004-tapi-add-PPC-support.diff b/devel/libtapi/files/patch-0004-tapi-add-PPC-support.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f12fbfe6906..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/files/patch-0004-tapi-add-PPC-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0b204f83e9907456deb1a44ab36f08a8362fd6f0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 5 Jul 2019 20:26:06 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] tapi - add ppc and ppc64 archs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/llvm/projects/libtapiinclude/tapi/Core/Architecture.def | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 8 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/llvm/projects/libtapi/include/tapi/Core/Architecture.def src/llvm/projects/libtapi/include/tapi/Core/Architecture.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 32b4bb5..37df40f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/llvm/projects/libtapi/include/tapi/Core/Architecture.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/llvm/projects/libtapi/include/tapi/Core/Architecture.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,6 +4,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ARCHINFO(arch)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_ARCH_PPC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ARCHINFO(ppc, MachO::CPU_TYPE_POWERPC, MachO::CPU_SUBTYPE_POWERPC_ALL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef SUPPORT_ARCH_PPC64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ARCHINFO(ppc64, MachO::CPU_TYPE_POWERPC64, MachO::CPU_SUBTYPE_POWERPC_ALL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ///
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// X86 architectures sorted by cpu type and sub type id.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ///
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/files/patch-lexer.diff b/devel/libtapi/files/patch-lexer.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 56356ef911a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/files/patch-lexer.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/llvm/projects/clang/lib/Lex/Lexer.cpp.orig 2020-12-19 14:12:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/llvm/projects/clang/lib/Lex/Lexer.cpp 2022-03-21 21:05:18.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2573,7 +2573,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '/', '/', '/', '/', '/', '/', '/', '/'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (CurPtr+16 <= BufferEnd &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- !vec_any_eq(*(const vector unsigned char*)CurPtr, Slashes))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ !vec_any_eq(*(const __vector unsigned char*)CurPtr, Slashes))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CurPtr += 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Scan for '/' quickly. Many block comments are very large.
</span></pre><pre style='margin:0'>
</pre>