<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d0aa6e638c913157aa4fecf0934ac595860e8566">https://github.com/macports/macports-ports/commit/d0aa6e638c913157aa4fecf0934ac595860e8566</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 d0aa6e638c9 libtapi: update to 1300.6.5
</span>d0aa6e638c9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d0aa6e638c913157aa4fecf0934ac595860e8566
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Tue Sep 26 22:41:08 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> libtapi: update to 1300.6.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - avoid enforcing `cmake-bootstrap` due to minimum required version;
</span><span style='display:block; white-space:pre;color:#404040;'> - switch to using legacysupport instead of patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: barracuda156 <vital.had@gmail.com>
</span>---
devel/libtapi/Portfile | 125 ++++++++++-----------
.../0001-Bitfields.h-fix-for-powerpc-darwin.patch | 25 +++++
...akeLists.txt-add-ppc-ppc64-to-known-archs.patch | 22 ++++
.../libtapi/files/optional-pthread_setname_np.diff | 15 ---
devel/libtapi/files/patch-0006-strnlen.diff | 93 ---------------
.../files/patch-0007-build-manpages-for-tapi.diff | 18 ---
6 files changed, 109 insertions(+), 189 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 689b300f0f5..00a84a0f4c3 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;'>@@ -4,13 +4,17 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup tpoechtrager apple-libtapi b7b5bdbfda9e8062d405b48da3b811afad98ae76
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# needed for strnlen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup tpoechtrager apple-libtapi a93b1459c4d4e3d62423fc628bd819d23147c448
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span> name libtapi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1100.0.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1300.6.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> maintainers {@catap korins.ky:kirill} openmaintainer
license APSL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,39 +23,27 @@ 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 a99aa279e626d4d638281ef9555d9b5db5f15145 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 66c715baaea6f28e8c079f36189027a52744138c38e83e97aeb399232365138f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 32205809
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# use cmake-bootstrap to minimize dependencies.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-replace path:bin/cmake:cmake port:cmake-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd ${prefix}/libexec/cmake-bootstrap/bin/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_skip_archcheck-append cmake-bootstrap
</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;'>- # pick a suitable python to build with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # system python is too old, use python27-bootstrap to minimize dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:python27-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=${prefix}/libexec/python27-bootstrap/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_skip_archcheck-append python27-bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${os.major} > 19} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use system python 3.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=/usr/bin/python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use the system python, which is known to be fine for darwin 11 to 19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXECUTABLE=/usr/bin/python2.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:#e0ffe0;'>+checksums rmd160 3a5dffea616234c6b23ae03d5e4c6efaf22da349 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 56c892d88704814217bf1865e4b60a2c5d83a117e3c1bbecc9dbc6075fdc768f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 38640450
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_version [string map {. {}} ${python_branch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-Bitfields.h-fix-for-powerpc-darwin.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-CMakeLists.txt-add-ppc-ppc64-to-known-archs.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:python${python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python${python_branch}
</span>
# remove need for port:libxml2 dependency
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DLIBXML2_LIBRARIES=IGNORE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DLIBXML2_LIBRARIES=IGNORE
</span>
# avoid opportunistic linking zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DLLVM_ENABLE_ZLIB=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DLLVM_ENABLE_ZLIB=OFF
</span>
# avoid opportunistic linking ncuses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append -DLLVM_ENABLE_TERMINFO=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DLLVM_ENABLE_TERMINFO=OFF
</span>
compiler.cxx_standard 2017
cmake.build_type Release
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,32 +57,31 @@ compiler.blacklist-append {clang < 801} {macports-clang-3.[3-8]}
</span> compiler.blacklist-append *gcc-3.* *gcc-4.* *gcc-5.* *gcc-6.* *gcc-7.*
if {[string match macports-clang-* ${configure.compiler}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append port:cctools
depends_skip_archcheck-append cctools
configure.args-append -DCMAKE_LIBTOOL=${prefix}/bin/libtool
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the default ld64-127 linker cannot build this with LTO at present in this configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if we could test the linker version, we might be able to enable it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if a newer linker than 127 is installed -- not sure where the cutoff is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DLLVM_ENABLE_LTO=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libtool will error on llvm bitcode generated by a clang version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # newer than the libLTO.dylib cctools is built against
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # making sure cctools is built against the newest llvm in use prevents this, but we can't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # always guarantee that will be the case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we can instead set DYLD_LIBRARY_PATH to the libLTO.dylib that matches the building clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # then libtool will use that libLTO.dylib instead, which matches the clang objects
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set clangversion [lindex [split ${configure.compiler} -] 2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env DYLD_LIBRARY_PATH=${prefix}/libexec/llvm-$clangversion/lib/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {(${os.platform} eq "darwin" && ${os.major} < 11) || [string match macports-gcc-* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the default ld64-127 linker cannot build this with LTO at present in this configuration
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if we could test the linker version, we might be able to enable it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if a newer linker than 127 is installed -- not sure where the cutoff is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DLLVM_ENABLE_LTO=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libtool will error on llvm bitcode generated by a clang version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # newer than the libLTO.dylib cctools is built against
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # making sure cctools is built against the newest llvm in use prevents this, but we can't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # always guarantee that will be the case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # we can instead set DYLD_LIBRARY_PATH to the libLTO.dylib that matches the building clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # then libtool will use that libLTO.dylib instead, which matches the clang objects
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set clangversion [lindex [split ${configure.compiler} -] 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env DYLD_LIBRARY_PATH=${prefix}/libexec/llvm-$clangversion/lib/
</span> }
# on macOS before 10.13 use clang-11-bootstrap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 17 && ${build_arch} ni [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 17 && ${configure.build_arch} ni [list ppc ppc64]} {
</span>
configure.compiler.add_deps no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,24 +105,32 @@ 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 a missing strnlen definition if needed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0006-strnlen.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# build manpages for tapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0007-build-manpages-for-tapi.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# don't try to call pthread_setname_np on 10.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append optional-pthread_setname_np.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${configure.build_arch} in [list ppc ppc64]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTAPI_SUPPORTED_ARCHS="ppc\;ppc64"
</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
configure.cxxflags-append \
-I${worksrcpath}/src/llvm/projects/clang/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${workpath}/build/projects/clang/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${cmake.build_dir}/projects/clang/include
</span>
configure.args-append -DLLVM_INCLUDE_TESTS=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DTAPI_INCLUDE_DOCS=ON
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target libtapi tapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target install-libtapi install-tapi install-tapi-headers install-tapi-clang-headers install-tapi-docs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTAPI_INCLUDE_DOCS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLLVM_ENABLE_PROJECTS="tapi\;clang" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTAPI_REPOSITORY_STRING=${version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTAPI_FULL_VERSION=${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target libtapi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tapi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tapi-docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tapi-headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target install-libtapi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-tapi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-tapi-docs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-tapi-headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.livecheck.branch ${version}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/files/0001-Bitfields.h-fix-for-powerpc-darwin.patch b/devel/libtapi/files/0001-Bitfields.h-fix-for-powerpc-darwin.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..80aa538b47a
</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/0001-Bitfields.h-fix-for-powerpc-darwin.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7c1386fe5ddb1290261f0daddf92c056e64c2964 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 13 Nov 2023 08:47:39 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/2] Bitfields.h: fix for powerpc-darwin
</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;'>+ src/llvm/include/llvm/ADT/Bitfields.h | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/llvm/include/llvm/ADT/Bitfields.h src/llvm/include/llvm/ADT/Bitfields.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d93f6483f..f3f42e37e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/llvm/include/llvm/ADT/Bitfields.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/llvm/include/llvm/ADT/Bitfields.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,7 +203,11 @@ template <typename T> struct ResolveUnderlyingType<T, false> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template <> struct ResolveUnderlyingType<bool, false> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// In case sizeof(bool) != 1, replace `void` by an additionnal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// std::conditional.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__APPLE__) && defined(__ppc__) // Darwin ppc ABI has 4-byte bool.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ using type = std::conditional<sizeof(bool) == 4, uint32_t, void>::type;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using type = std::conditional<sizeof(bool) == 1, uint8_t, void>::type;
</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;'>+ } // namespace bitfields_details
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/files/0002-CMakeLists.txt-add-ppc-ppc64-to-known-archs.patch b/devel/libtapi/files/0002-CMakeLists.txt-add-ppc-ppc64-to-known-archs.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..bd0401b295e
</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/0002-CMakeLists.txt-add-ppc-ppc64-to-known-archs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From bcdc65f7c2aad91d7838189070323cbcff429496 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 13 Nov 2023 08:54:49 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/2] CMakeLists.txt: add ppc/ppc64 to known archs
</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;'>+ src/tapi/CMakeLists.txt | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/tapi/CMakeLists.txt src/tapi/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d08557213..59b740893 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tapi/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tapi/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,7 @@ elseif(NOT DEFINED TAPI_SUPPORTED_ARCHS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Supported Architectures: ${TAPI_SUPPORTED_ARCHS}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(KNOWN_ARCHS i386 x86_64 x86_64h armv4t armv6 armv5 armv7 armv7s armv7k armv6m armv7m armv7em arm64 arm64e)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set(KNOWN_ARCHS i386 x86_64 x86_64h armv4t armv6 armv5 armv7 armv7s armv7k armv6m armv7m armv7em arm64 arm64e ppc ppc64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set (CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/include/tapi/Core/ArchitectureConfig.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file(WRITE ${CONFIG_FILE} "#ifndef TAPI_CORE_ARCHITECTURE_CONFIG_H\n")
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8994f691fbc..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/files/optional-pthread_setname_np.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 2d49ce1ad..9c9e98b81 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/llvm/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/llvm/lib/Support/Unix/Threading.inc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,8 +154,10 @@ void llvm::set_thread_name(const Twine &Name) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ::pthread_setname_np(::pthread_self(), "%s",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const_cast<char *>(NameStr.data()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if HAVE_PTHREAD_SETNAME_NP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ::pthread_setname_np(NameStr.data());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</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;'>- 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-0006-strnlen.diff b/devel/libtapi/files/patch-0006-strnlen.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7d46ff2d639..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/files/patch-0006-strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,93 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/llvm/projects/clang/lib/Lex/HeaderMap.cpp.orig 2020-01-18 11:46:01.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/llvm/projects/clang/lib/Lex/HeaderMap.cpp 2020-01-18 11:47:07.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace clang;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- /// HashHMapKey - This is the 'well known' hash function required by the file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// format, used to look up keys in the hash table. The hash table uses simple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// linear probing based on this function.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/llvm/tools/obj2yaml/macho2yaml.cpp.orig 2020-01-18 18:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/llvm/tools/obj2yaml/macho2yaml.cpp 2020-01-18 18:34:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string.h> // for memcpy
</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;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- using namespace llvm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class MachODumper {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/llvm/lib/ObjectYAML/MachOYAML.cpp.orig 2020-01-18 16:28:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/llvm/lib/ObjectYAML/MachOYAML.cpp 2020-01-18 16:29:55.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstdint>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cstring>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MachOYAML::LoadCommand::~LoadCommand() = default;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/llvm/tools/llvm-readobj/ObjDumper.cpp.orig 2020-01-18 18:29:32.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/llvm/tools/llvm-readobj/ObjDumper.cpp 2020-01-18 18:29:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/ScopedPrinter.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/Support/raw_ostream.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static size_t strnlen(const char *s, size_t maxlen) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t l = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while (l < maxlen && *s) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ l++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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;'>- namespace llvm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ObjDumper::ObjDumper(ScopedPrinter &Writer) : W(Writer) {}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/files/patch-0007-build-manpages-for-tapi.diff b/devel/libtapi/files/patch-0007-build-manpages-for-tapi.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ad37ad5a0cf..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/files/patch-0007-build-manpages-for-tapi.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 848184f1dcb1c8f80bd08159a545260ca8f3172c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Cameron Katri <me@cameronkatri.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 24 Jun 2021 14:42:52 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Build manpages for tapi
</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/libtapi/CMakeLists.txt | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+)
</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/CMakeLists.txt src/llvm/projects/libtapi/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8ee6d8138..5daf0a5fb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/llvm/projects/libtapi/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/llvm/projects/libtapi/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,3 +203,4 @@ get_property(TAPI_TABLEGEN_TARGETS GLOBAL PROPERTY TAPI_TABLEGEN_TARGETS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list(APPEND LLVM_COMMON_DEPENDS ${TAPI_TABLEGEN_TARGETS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(tools)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_subdirectory(docs)
</span></pre><pre style='margin:0'>
</pre>