<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/348baa56f541fcea1f9c9aa5099980961a8c9e5a">https://github.com/macports/macports-ports/commit/348baa56f541fcea1f9c9aa5099980961a8c9e5a</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 348baa56f54 libtapi: update to 1100.0.11
</span>348baa56f54 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 348baa56f541fcea1f9c9aa5099980961a8c9e5a
</span>Author: Gcenx <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Mon Nov 15 09:52:14 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> libtapi: update to 1100.0.11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use tpoechtrager apple-libtapi as the source as this already includes multiple fixes.
</span>---
devel/libtapi/Portfile | 112 ++++------------
.../files/patch-0001-clang-tools-add-tapi.diff | 8 --
...tch-0002-tapi-zippered-support-poechtrager.diff | 102 ---------------
.../files/patch-0002-tapi-zippered-support.diff | 91 -------------
.../files/patch-0003-tapi-llvm7-build-fixes.diff | 144 ---------------------
.../files/patch-0004-tapi-add-PPC-support.diff | 8 +-
.../libtapi/files/patch-0005-tapi-test-fixes.diff | 51 --------
devel/libtapi/files/patch-0006-strnlen.diff | 16 +--
.../files/patch-0007-build-manpages-for-tapi.diff | 18 +++
9 files changed, 57 insertions(+), 493 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 1e58eb75d53..43425b19d7f 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,10 +3,12 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup tpoechtrager apple-libtapi 664b84
</span> name libtapi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1000.10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1100.0.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,28 +19,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;'>-master_sites http://opensource.apple.com/tarballs/tapi:tapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles tapi-${version}.tar.gz:tapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums tapi-${version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f5aad7f6ed579ce83d1206910ea8885043b4ebdb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 827e996529974305ef7933f3fa790f7ed068caa29db8f8c30b8a83c6826503f7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 205606
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set llvm_version 7.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites-append https://github.com/llvm/llvm-project/archive/:llvm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles-append llvmorg-${llvm_version}.tar.gz:llvm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums-append llvmorg-${llvm_version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 abdbeaa08cb1c5e9ce4008e47263eb10597f5aed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 71c93979f20e01f1a1cc839a247945f556fa5e63abf2084e8468b238080fd839 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 105306132
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir tapi_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${workpath}/llvm-project-llvmorg-${llvm_version} ${workpath}/${worksrcdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${workpath}/tapi-${version} ${worksrcpath}/tapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ../../tapi ${worksrcpath}/clang/tools/tapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cbd3719ff2a33d4f5d738e0c89c5c194b05e0dee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f2c3b3e467814b45d4afc768e4eb94b591dbfb24e086724f6b9a9c4c05793861 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32204487
</span>
platform darwin {
# pick a suitable python to build with
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,16 +42,23 @@ platform darwin {
</span> # remove need for port:libxml2 dependency
configure.args-append -DLIBXML2_LIBRARIES=IGNORE
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid opportunistic linking zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DLLVM_ENABLE_ZLIB=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid opportunistic linking ncuses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DLLVM_ENABLE_TERMINFO=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2011
cmake.build_type Release
# needs support for llvm::Expect, which requires c++17 inline variables (clang 3.9+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 801}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {macports-clang-3.[3-8]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 801} {macports-clang-3.[3-8]}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# gcc5 errors building this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append macports-gcc-5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# needs gcc8 or later to compile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# $SRC_DIR/src/llvm/projects/libtapi/lib/Core/APIJSONSerializer.cpp:1202:10: error: could not convert
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 'result' from 'tapi::internal::API' to 'llvm::Expected<tapi::internal::API>' return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append *gcc-3.* *gcc-4.* *gcc-5.* *gcc-6.* *gcc-7.*
</span>
if {[string match macports-clang-* ${configure.compiler}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,73 +99,25 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> configure.cxxflags-append -U__STRICT_ANSI__
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.post_args ${worksrcpath}/llvm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# add the tapi directory to the clang build CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0001-clang-tools-add-tapi.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patches from https://github.com/iains/tapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and from https://github.com/tpoechtrager/apple-libtapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# add zippered support for MacOSX10.14.sdk and above
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0002-tapi-zippered-support-poechtrager.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix tapi build for llvm version 7 (and newer?)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0003-tapi-llvm7-build-fixes.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # add support for PPC architectures
patchfiles-append patch-0004-tapi-add-PPC-support.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fixes to tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-0005-tapi-test-fixes.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # add a missing strnlen definition if needed
patchfiles-append patch-0006-strnlen.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-append -C ${worksrcpath}/tapi/cmake/caches/apple-tapi.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target distribution
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install-distribution
</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;'>-if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this gcc build is allowed here for possible ld64 bootstrapping purposes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # it links against libgcc/libstdc++.6.dylib and libgcc/libgcc_s.1.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DLLVM_ENABLE_PROJECTS=\"clang\;tapi\"
</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:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# build manpages for tapi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-0007-build-manpages-for-tapi.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant tests description {Enable building of test code} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DLLVM_INCLUDE_TESTS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args ${worksrcpath}/src/llvm
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # tests work on 10.13 - not tested 10.10 - 10.12 as yet
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# needed for libtapi to find some required files
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+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:#ffe0e0;'>- # there is a conflict between modules and MacPorts' ncurses port: #59992
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # temporarily disabling the ncurses port to run the tests works
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # removing the test that includes modules also works and requires no intervention
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|add_subdirectory(Mod)||g" ${worksrcpath}/tapi/test/Inputs/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DLLVM_INCLUDE_TESTS=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DTAPI_INCLUDE_DOCS=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # tests error on 10.14+ due to hard-coded i386 builds - this fixes most of them
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # there are a few tests that fail due to i386-related errors still
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.platform} eq "darwin" && ${os.major} >= 18} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {test unittests} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse path ${worksrcpath}/tapi/${dir} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file isfile ${path}] && [string match {*CMakeLists.txt} ${path}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-arch i386||g" ${path}
</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><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><span style='display:block; white-space:pre;background:#ffe0e0;'>- # tests did not work on 10.6.8, first due to missing architecture defines, then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # due to other errors. Help wanted to fix these tests if possible.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test.target check-tapi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target libtapi tapi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target install-libtapi install-tapi install-tapi-headers install-tapi-clang-headers install-tapi-docs
</span>
livecheck.type regex
livecheck.regex "tapi-(\[\\d.\]+)"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/files/patch-0001-clang-tools-add-tapi.diff b/devel/libtapi/files/patch-0001-clang-tools-add-tapi.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 64d6608609d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/files/patch-0001-clang-tools-add-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,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- clang/tools/CMakeLists.txt.orig 2020-01-16 15:51:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ clang/tools/CMakeLists.txt 2020-01-16 15:51:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,3 +35,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libclang may require clang-tidy in clang-tools-extra.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_clang_subdirectory(libclang)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+add_clang_subdirectory(tapi)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/files/patch-0002-tapi-zippered-support-poechtrager.diff b/devel/libtapi/files/patch-0002-tapi-zippered-support-poechtrager.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a56d53282e6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/files/patch-0002-tapi-zippered-support-poechtrager.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,102 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 90d0bae361b0af326b07887252a70b7d9256a9f8 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: =?UTF-8?q?Thomas=20Pl=C3=B6chtrager?= <t.poechtrager@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 30 May 2019 11:35:48 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] An attempt to get TAPI platform "zippered" working
</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;'>- include/tapi/Core/Platform.h | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include/tapi/LinkerInterfaceFile.h | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Core/Platform.cpp | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Core/YAML.cpp | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 files changed, 15 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/include/tapi/Core/Platform.h tapi/include/tapi/Core/Platform.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index afe19df8a..3293d48a7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/include/tapi/Core/Platform.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/include/tapi/Core/Platform.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,8 @@ enum class Platform : uint8_t {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- watchOS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- watchOSSimulator,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bridgeOS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ iOSMac,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ zippered
</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;'>- Platform mapToSim(Platform platform, bool wantSim);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/include/tapi/LinkerInterfaceFile.h tapi/include/tapi/LinkerInterfaceFile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a18d9bee8..6f8282cfb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/include/tapi/LinkerInterfaceFile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/include/tapi/LinkerInterfaceFile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,6 +64,8 @@ enum class Platform : unsigned {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// \since 1.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bridgeOS = 5,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ iOSMac = 6,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ zippered = 10
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/lib/Core/Platform.cpp tapi/lib/Core/Platform.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 29e1ab476..3ff15bcef 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/lib/Core/Platform.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/lib/Core/Platform.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,6 +93,10 @@ StringRef getPlatformName(Platform platform) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "tvOSSimulator";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case Platform::bridgeOS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "bridgeOS";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case Platform::iOSMac:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "iOSMac";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case Platform::zippered:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "zippered";
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,6 +120,10 @@ std::string getOSAndEnvironmentName(Platform platform, std::string version) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "tvos" + version + "-simulator";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case Platform::bridgeOS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "bridgeos" + version;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case Platform::iOSMac:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "iOSMac" + version;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case Platform::zippered:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "zippered" + version;
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/lib/Core/YAML.cpp tapi/lib/Core/YAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3aa286ecd..f34e7c235 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/lib/Core/YAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/lib/Core/YAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,6 +55,9 @@ void ScalarEnumerationTraits<Platform>::enumeration(IO &io,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- io.enumCase(platform, "tvos", Platform::tvOS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- io.enumCase(platform, "tvos", Platform::tvOSSimulator);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- io.enumCase(platform, "bridgeos", Platform::bridgeOS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ io.enumCase(platform, "iosmac", Platform::zippered);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ io.enumCase(platform, "zippered", Platform::zippered);
</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;'>- using TAPI_INTERNAL::Architecture;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- From e92ebe1484033f91c80d9cf1a90c44f95c8c81fa Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= <t.poechtrager@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 30 May 2019 18:34:46 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] An attempt to get TAPI platform "zippered" working #2
</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;'>- LinkerInterfaceFile.cpp | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/tools/libtapi/LinkerInterfaceFile.cpp tapi/tools/libtapi/LinkerInterfaceFile.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b6789990e..e4952df50 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/tools/libtapi/LinkerInterfaceFile.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/tools/libtapi/LinkerInterfaceFile.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -298,6 +298,10 @@ static tapi::Platform mapPlatform(tapi::internal::Platform platform) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Platform::tvOS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case tapi::internal::Platform::bridgeOS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Platform::bridgeOS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case tapi::internal::Platform::iOSMac:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return Platform::iOSMac;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case tapi::internal::Platform::zippered:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return Platform::zippered;
</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>\ No newline at end of file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/files/patch-0002-tapi-zippered-support.diff b/devel/libtapi/files/patch-0002-tapi-zippered-support.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0833f429eea..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/files/patch-0002-tapi-zippered-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,91 +0,0 @@
</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, 3 Jan 2020 08:42:04 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] [tapi] Implement zippered support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Recent SDKs have introduced a platform type 'zippered'. This
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-is understood to allow the same specfication to be used for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MacOS and iOSMac.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This is an implementation of support estimated as needed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It is sufficient, at present, to use Darwin18 and 19 SDKs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include/tapi/Core/Platform.h | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include/tapi/LinkerInterfaceFile.h | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Core/Platform.cpp | 4 ++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lib/Core/YAML.cpp | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/libtapi/LinkerInterfaceFile.cpp | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5 files changed, 11 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/include/tapi/Core/Platform.h tapi/include/tapi/Core/Platform.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index afe19df..ff39fd3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/include/tapi/Core/Platform.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/include/tapi/Core/Platform.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,7 @@ enum class Platform : uint8_t {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- watchOS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- watchOSSimulator,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bridgeOS,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ zippered,
</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;'>- Platform mapToSim(Platform platform, bool wantSim);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/include/tapi/LinkerInterfaceFile.h tapi/include/tapi/LinkerInterfaceFile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a18d9be..987cc4b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/include/tapi/LinkerInterfaceFile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/include/tapi/LinkerInterfaceFile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,6 +64,9 @@ enum class Platform : unsigned {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// \since 1.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bridgeOS = 5,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /// \brief zippered
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /// \since 2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ zippered = 6,
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/lib/Core/Platform.cpp tapi/lib/Core/Platform.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 29e1ab4..af62f3d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/lib/Core/Platform.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/lib/Core/Platform.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -93,6 +93,8 @@ StringRef getPlatformName(Platform platform) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "tvOSSimulator";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case Platform::bridgeOS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "bridgeOS";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case Platform::zippered:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "zippered";
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,6 +118,8 @@ std::string getOSAndEnvironmentName(Platform platform, std::string version) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "tvos" + version + "-simulator";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case Platform::bridgeOS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return "bridgeos" + version;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case Platform::zippered:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return "zippered" + version;
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/lib/Core/YAML.cpp tapi/lib/Core/YAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3aa286e..823a542 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/lib/Core/YAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/lib/Core/YAML.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,6 +55,7 @@ void ScalarEnumerationTraits<Platform>::enumeration(IO &io,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- io.enumCase(platform, "tvos", Platform::tvOS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- io.enumCase(platform, "tvos", Platform::tvOSSimulator);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- io.enumCase(platform, "bridgeos", Platform::bridgeOS);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ io.enumCase(platform, "zippered", Platform::zippered);
</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;'>- using TAPI_INTERNAL::Architecture;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/tools/libtapi/LinkerInterfaceFile.cpp tapi/tools/libtapi/LinkerInterfaceFile.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b678999..c0f1ff0 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/tools/libtapi/LinkerInterfaceFile.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/tools/libtapi/LinkerInterfaceFile.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -298,6 +298,8 @@ static tapi::Platform mapPlatform(tapi::internal::Platform platform) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Platform::tvOS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case tapi::internal::Platform::bridgeOS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Platform::bridgeOS;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case tapi::internal::Platform::zippered:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return Platform::zippered;
</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>\ No newline at end of file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/files/patch-0003-tapi-llvm7-build-fixes.diff b/devel/libtapi/files/patch-0003-tapi-llvm7-build-fixes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a8b887dc853..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/files/patch-0003-tapi-llvm7-build-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,144 +0,0 @@
</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: Sun, 2 Sep 2018 16:30:49 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] [tapi, llvm] VersionTuple from Support.
</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;'>- include/tapi/Core/ArchitectureSupport.h | 4 ++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/include/tapi/Core/ArchitectureSupport.h tapi/include/tapi/Core/ArchitectureSupport.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 148c5ca..56f2d91 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/include/tapi/Core/ArchitectureSupport.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/include/tapi/Core/ArchitectureSupport.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,9 +21,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "tapi/LinkerInterfaceFile.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "tapi/PackedVersion32.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "tapi/tapi.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include "clang/Basic/VersionTuple.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/ADT/StringRef.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;'>-+#include "llvm/Support/VersionTuple.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <utility>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TAPI_NAMESPACE_INTERNAL_BEGIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +35,7 @@ struct PackedVersion {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- constexpr PackedVersion(uint32_t version) : _version(version) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PackedVersion(unsigned major, unsigned minor, unsigned subminor)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : _version((major << 16) | ((minor & 0xff) << 8) | (subminor & 0xff)) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PackedVersion(clang::VersionTuple version) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PackedVersion(llvm::VersionTuple version) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _version = version.getMajor() << 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (auto minor = version.getMinor())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _version |= (*minor & 0xff) << 8;
</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><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 13:09:53 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] [tapi] Add a missed <vector> header.
</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;'>- include/tapi/Core/HeaderFile.h | 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 tapi/include/tapi/Core/HeaderFile.h tapi/include/tapi/Core/HeaderFile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index eaf5f77..baeb610 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/include/tapi/Core/HeaderFile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/include/tapi/Core/HeaderFile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "tapi/Defines.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "llvm/ADT/StringRef.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <vector>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TAPI_NAMESPACE_INTERNAL_BEGIN
</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><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: Sun, 2 Sep 2018 16:48:58 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] [tapi] API changes for ExecuteAndWait().
</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;'>- lib/Driver/InstallAPIDriver.cpp | 23 ++++++++++++++---------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 14 insertions(+), 9 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/lib/Driver/InstallAPIDriver.cpp tapi/lib/Driver/InstallAPIDriver.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8f5a3be..ddb9454 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/lib/Driver/InstallAPIDriver.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/lib/Driver/InstallAPIDriver.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -331,7 +331,8 @@ getCodeCoverageSymbols(DiagnosticsEngine &diag,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string installDir = toolchainBinDir;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::vector<std::unique_ptr<ExtendedInterfaceFile>> files;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (const auto &target : targets) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const char *clangArgs[] = {"clang",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SmallVector<const char*, 128> ClangArgv =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"clang",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-target",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target.str().c_str(),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-dynamiclib",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -353,12 +354,16 @@ getCodeCoverageSymbols(DiagnosticsEngine &diag,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FileRemover removeStderrFile(stderrFile);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const Optional<StringRef> redirects[] = {/*STDIN=*/llvm::None,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /*STDOUT=*/llvm::None,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /*STDERR=*/StringRef(stderrFile)};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool failed = sys::ExecuteAndWait(clangBinary.get(), clangArgs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /*env=*/nullptr, redirects);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ StringRef stderrFileStr(stderrFile);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SmallVector<llvm::Optional<StringRef>, 3> Rd =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {/*STDIN=*/ llvm::None,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /*STDOUT=*/llvm::None,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /*STDERR=*/StringRef(stderrFile)};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ArrayRef<Optional<StringRef>> Redirects(Rd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Optional<ArrayRef<StringRef>> Env;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ auto Args = llvm::toStringRefArray(ClangArgv.data());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool failed = sys::ExecuteAndWait(clangBinary.get(), Args,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Env, Redirects);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (failed) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto bufferOr = MemoryBuffer::getFile(stderrFile);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -366,8 +371,8 @@ getCodeCoverageSymbols(DiagnosticsEngine &diag,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return make_error<StringError>("unable to read file", ec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string message = "'clang' invocation failed:\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (auto *arg : clangArgs) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (arg == nullptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (auto arg : Args) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (arg == "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message.append(arg).append(1, ' ');
</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;'>-From 36b039df99f82c5cb1b2eb112b0d1eedfeadea81 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: Sun, 2 Sep 2018 16:40:25 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] [tapi] Diagnostics generation needs declaration of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TextSubstitution class.
</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;'>- include/tapi/Diagnostics/DiagnosticTAPIKinds.td | 9 +++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 9 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/include/tapi/Diagnostics/DiagnosticTAPIKinds.td tapi/include/tapi/Diagnostics/DiagnosticTAPIKinds.td
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 76eb025..0029221 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/include/tapi/Diagnostics/DiagnosticTAPIKinds.td
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/include/tapi/Diagnostics/DiagnosticTAPIKinds.td
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,15 @@
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Textual substitutions which may be performed on the text of diagnostics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class TextSubstitution<string Text> {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string Substitution = Text;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // TODO: These are only here to allow substitutions to be declared inline with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // diagnostics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string Component = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string CategoryName = "";
</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;'>- // Define the diagnostic severities.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Severity<string N> {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string Name = N;
</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><span style='display:block; white-space:pre;color:#808080;'>index ce3a2611707..f12fbfe6906 100644
</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;'>+++ b/devel/libtapi/files/patch-0004-tapi-add-PPC-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,13 +4,13 @@ Date: Fri, 5 Jul 2019 20:26:06 +0100
</span> Subject: [PATCH] tapi - add ppc and ppc64 archs.
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- include/tapi/Core/Architecture.def | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/llvm/projects/libtapiinclude/tapi/Core/Architecture.def | 8 ++++++++
</span> 1 file changed, 8 insertions(+)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/include/tapi/Core/Architecture.def tapi/include/tapi/Core/Architecture.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/llvm/projects/libtapi/include/tapi/Core/Architecture.def src/llvm/projects/libtapi/include/tapi/Core/Architecture.def
</span> index 32b4bb5..37df40f 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/include/tapi/Core/Architecture.def
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/include/tapi/Core/Architecture.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/llvm/projects/libtapi/include/tapi/Core/Architecture.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/llvm/projects/libtapi/include/tapi/Core/Architecture.def
</span> @@ -4,6 +4,14 @@
#define ARCHINFO(arch)
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/files/patch-0005-tapi-test-fixes.diff b/devel/libtapi/files/patch-0005-tapi-test-fixes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b48f321087f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libtapi/files/patch-0005-tapi-test-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7b2d305d6c16cbd503a1ad2c2312697e8e484ad6 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: Sun, 2 Sep 2018 16:50:15 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] [tapi, test] Allow the use of a specified sysroot.
</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;'>- test/CMakeLists.txt | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test/lit.cfg | 3 ++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test/lit.site.cfg.in | 1 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 5 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/test/CMakeLists.txt tapi/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 90fe6c4..50e91c4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,7 +53,9 @@ ExternalProject_Add(TestInputs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_SYSROOT=${CMAKE_SYSROOT}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_BUILD_TYPE=Release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOG_CONFIGURE 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LOG_BUILD 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/test/lit.cfg tapi/test/lit.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fd08bbe..92d45a4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/test/lit.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/test/lit.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -264,7 +264,8 @@ config.inputs = os.path.join(tapi_obj_root, 'Inputs')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.tapi = infer_tapi(config.environment['PATH']).replace('\\', '/')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.tapi_run = infer_tapi_run(config.environment['PATH']).replace('\\', '/')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.tapi_frontend = infer_tapi_frontend(config.environment['PATH']).replace('\\', '/')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--config.sysroot = get_macos_sdk_path(config)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if config.sysroot == '':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ config.sysroot = get_macos_sdk_path(config)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lit_config.note('using SDKROOT: %r' % config.sysroot)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.substitutions.append( ('%inputs', config.inputs) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git tapi/test/lit.site.cfg.in tapi/test/lit.site.cfg.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5e54c18..0fc027b 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tapi/test/lit.site.cfg.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tapi/test/lit.site.cfg.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,6 +9,7 @@ config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.tapi_obj_root = "@TAPI_BINARY_DIR@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+config.sysroot = "@TAPI_SYSROOT@"
</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;'>- # Support substitution of the tools and libs dirs with user parameters. This is
</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><span style='display:block; white-space:pre;color:#808080;'>index b0d13636800..7d46ff2d639 100644
</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;'>+++ b/devel/libtapi/files/patch-0006-strnlen.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./clang/lib/Lex/HeaderMap.cpp.orig 2020-01-18 11:46:01.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./clang/lib/Lex/HeaderMap.cpp 2020-01-18 11:47:07.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ src/llvm/projects/clang/lib/Lex/HeaderMap.cpp 2020-01-18 11:47:07.000000000 -0800
</span> @@ -26,6 +26,20 @@
#include <memory>
using namespace clang;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +21,8 @@
</span> /// HashHMapKey - This is the 'well known' hash function required by the file
/// format, used to look up keys in the hash table. The hash table uses simple
/// linear probing based on this function.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm/tools/obj2yaml/macho2yaml.cpp.orig 2020-01-18 18:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ llvm/tools/obj2yaml/macho2yaml.cpp 2020-01-18 18:34:12.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/llvm/tools/obj2yaml/macho2yaml.cpp.orig 2020-01-18 18:33:48.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/llvm/tools/obj2yaml/macho2yaml.cpp 2020-01-18 18:34:12.000000000 -0800
</span> @@ -17,6 +17,21 @@
#include <string.h> // for memcpy
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,8 +45,8 @@
</span> using namespace llvm;
class MachODumper {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- llvm/lib/ObjectYAML/MachOYAML.cpp.orig 2020-01-18 16:28:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ llvm/lib/ObjectYAML/MachOYAML.cpp 2020-01-18 16:29:55.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/llvm/lib/ObjectYAML/MachOYAML.cpp.orig 2020-01-18 16:28:13.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/llvm/lib/ObjectYAML/MachOYAML.cpp 2020-01-18 16:29:55.000000000 -0800
</span> @@ -22,6 +22,20 @@
#include <cstdint>
#include <cstring>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,8 +68,8 @@
</span> namespace llvm {
MachOYAML::LoadCommand::~LoadCommand() = default;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- 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;'>-+++ llvm/tools/llvm-readobj/ObjDumper.cpp 2020-01-18 18:29:58.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ src/llvm/tools/llvm-readobj/ObjDumper.cpp 2020-01-18 18:29:58.000000000 -0800
</span> @@ -20,6 +20,20 @@
#include "llvm/Support/ScopedPrinter.h"
#include "llvm/Support/raw_ostream.h"
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ad37ad5a0cf
</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/patch-0007-build-manpages-for-tapi.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 848184f1dcb1c8f80bd08159a545260ca8f3172c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Cameron Katri <me@cameronkatri.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 24 Jun 2021 14:42:52 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Build manpages for tapi
</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/projects/libtapi/CMakeLists.txt | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/llvm/projects/libtapi/CMakeLists.txt src/llvm/projects/libtapi/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8ee6d8138..5daf0a5fb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/llvm/projects/libtapi/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/llvm/projects/libtapi/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -203,3 +203,4 @@ get_property(TAPI_TABLEGEN_TARGETS GLOBAL PROPERTY TAPI_TABLEGEN_TARGETS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list(APPEND LLVM_COMMON_DEPENDS ${TAPI_TABLEGEN_TARGETS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(tools)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_subdirectory(docs)
</span></pre><pre style='margin:0'>
</pre>