<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/358bba9ebfd25dd2e78bc961e63c720de6caf27d">https://github.com/macports/macports-ports/commit/358bba9ebfd25dd2e78bc961e63c720de6caf27d</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 358bba9 libtapi @ 1000.10.8: new port
</span>358bba9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 358bba9ebfd25dd2e78bc961e63c720de6caf27d
</span>Author: kencu <ken.cunningham.webuse@gmail.com>
AuthorDate: Fri Jan 17 16:18:09 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> libtapi @ 1000.10.8: new port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> adds Text-Based API support to ld64
</span><span style='display:block; white-space:pre;color:#404040;'> allows open-source versions of ld64 to support newer
</span><span style='display:block; white-space:pre;color:#404040;'> MacOS SDK versions that come with only *.tbd files
</span><span style='display:block; white-space:pre;color:#404040;'> instead of full or stub dylibs to link against
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> see https://trac.macports.org/ticket/53784
</span>---
devel/libtapi/Portfile | 74 +++++++++++
.../files/patch-0001-clang-tools-add-tapi.diff | 8 ++
.../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 | 28 ++++
.../libtapi/files/patch-0005-tapi-test-fixes.diff | 51 ++++++++
6 files changed, 396 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libtapi/Portfile b/devel/libtapi/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..baf87d4
</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/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,74 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name libtapi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1000.10.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {kencu @kencu} {jeremyhu @jeremyhu} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license APSL-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description ${name} adds ld64 linker support for text-based API libraries.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description ${description} Newer MacOS SDKs contain only these TAPI stubs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://opensource.apple.com/source/tapi/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://opensource.apple.com/tarballs/tapi:tapi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles tapi-${version}.tar.gz:tapi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums tapi-${version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f5aad7f6ed579ce83d1206910ea8885043b4ebdb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 827e996529974305ef7933f3fa790f7ed068caa29db8f8c30b8a83c6826503f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 205606
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set llvm_version 7.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites-append https://github.com/llvm/llvm-project/archive/:llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles-append llvmorg-${llvm_version}.tar.gz:llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums-append llvmorg-${llvm_version}.tar.gz \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 abdbeaa08cb1c5e9ce4008e47263eb10597f5aed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 71c93979f20e01f1a1cc839a247945f556fa5e63abf2084e8468b238080fd839 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 105306132
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir tapi_build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${workpath}/llvm-project-llvmorg-${llvm_version} ${workpath}/${worksrcdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file rename ${workpath}/tapi-${version} ${worksrcpath}/tapi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "ln -s ../../tapi ${worksrcpath}/clang/tools/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;'>+depends_build-append port:python27 port:libxml2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DPYTHON_EXECUTABLE=${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-replace -DCMAKE_BUILD_TYPE=MacPorts -DCMAKE_BUILD_TYPE=Release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.post_args ${worksrcpath}/llvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# add the tapi directory to the clang build CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-0001-clang-tools-add-tapi.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patches from https://github.com/iains/tapi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# add zippered support for MacOSX10.14.sdk and above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-0002-tapi-zippered-support.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix tapi build for llvm version 7 (and newer?)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-0003-tapi-llvm7-build-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# add support for PPC architectures
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-0004-tapi-add-PPC-support.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -C ${worksrcpath}/tapi/cmake/caches/apple-tapi.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target distribution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target install-distribution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# WIP at present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#configure.args-append -DLLVM_INCLUDE_TESTS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#patchfiles-append patch-0005-tapi-test-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#test.target check-distribution
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "tapi-(\[\\d.\]+)"
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..64d6608
</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-0001-clang-tools-add-tapi.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- clang/tools/CMakeLists.txt.orig 2020-01-16 15:51:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ clang/tools/CMakeLists.txt 2020-01-16 15:51:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,3 +35,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # libclang may require clang-tidy in clang-tools-extra.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_clang_subdirectory(libclang)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++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.diff b/devel/libtapi/files/patch-0002-tapi-zippered-support.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0833f42
</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-0002-tapi-zippered-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,91 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 3 Jan 2020 08:42:04 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [tapi] Implement zippered support.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Recent SDKs have introduced a platform type 'zippered'. This
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is understood to allow the same specfication to be used for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MacOS and iOSMac.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is an implementation of support estimated as needed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+It is sufficient, at present, to use Darwin18 and 19 SDKs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/tapi/Core/Platform.h | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/tapi/LinkerInterfaceFile.h | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Core/Platform.cpp | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib/Core/YAML.cpp | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tools/libtapi/LinkerInterfaceFile.cpp | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 files changed, 11 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/include/tapi/Core/Platform.h tapi/include/tapi/Core/Platform.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index afe19df..ff39fd3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/include/tapi/Core/Platform.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/include/tapi/Core/Platform.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,7 @@ enum class Platform : uint8_t {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ watchOS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ watchOSSimulator,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bridgeOS,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zippered,
</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;'>+ Platform mapToSim(Platform platform, bool wantSim);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/include/tapi/LinkerInterfaceFile.h tapi/include/tapi/LinkerInterfaceFile.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a18d9be..987cc4b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/include/tapi/LinkerInterfaceFile.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/include/tapi/LinkerInterfaceFile.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -64,6 +64,9 @@ enum class Platform : unsigned {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// \since 1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bridgeOS = 5,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /// \brief zippered
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /// \since 2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ zippered = 6,
</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;'>+ ///
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/lib/Core/Platform.cpp tapi/lib/Core/Platform.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 29e1ab4..af62f3d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/lib/Core/Platform.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/lib/Core/Platform.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,6 +93,8 @@ StringRef getPlatformName(Platform platform) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "tvOSSimulator";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Platform::bridgeOS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "bridgeOS";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case Platform::zippered:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return "zippered";
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -116,6 +118,8 @@ std::string getOSAndEnvironmentName(Platform platform, std::string version) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "tvos" + version + "-simulator";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case Platform::bridgeOS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "bridgeos" + version;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case Platform::zippered:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return "zippered" + version;
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/lib/Core/YAML.cpp tapi/lib/Core/YAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3aa286e..823a542 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/lib/Core/YAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/lib/Core/YAML.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,6 +55,7 @@ void ScalarEnumerationTraits<Platform>::enumeration(IO &io,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ io.enumCase(platform, "tvos", Platform::tvOS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ io.enumCase(platform, "tvos", Platform::tvOSSimulator);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ io.enumCase(platform, "bridgeos", Platform::bridgeOS);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ io.enumCase(platform, "zippered", Platform::zippered);
</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;'>+ using TAPI_INTERNAL::Architecture;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/tools/libtapi/LinkerInterfaceFile.cpp tapi/tools/libtapi/LinkerInterfaceFile.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b678999..c0f1ff0 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/tools/libtapi/LinkerInterfaceFile.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/tools/libtapi/LinkerInterfaceFile.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -298,6 +298,8 @@ static tapi::Platform mapPlatform(tapi::internal::Platform platform) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Platform::tvOS;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case tapi::internal::Platform::bridgeOS:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return Platform::bridgeOS;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ case tapi::internal::Platform::zippered:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return Platform::zippered;
</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;'>+
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a8b887d
</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-0003-tapi-llvm7-build-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,144 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 2 Sep 2018 16:30:49 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [tapi, llvm] VersionTuple from Support.
</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;'>+ include/tapi/Core/ArchitectureSupport.h | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/include/tapi/Core/ArchitectureSupport.h tapi/include/tapi/Core/ArchitectureSupport.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 148c5ca..56f2d91 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/include/tapi/Core/ArchitectureSupport.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/include/tapi/Core/ArchitectureSupport.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,9 +21,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tapi/LinkerInterfaceFile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tapi/PackedVersion32.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tapi/tapi.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "clang/Basic/VersionTuple.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/ADT/StringRef.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/Support/raw_ostream.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "llvm/Support/VersionTuple.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <utility>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TAPI_NAMESPACE_INTERNAL_BEGIN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@ struct PackedVersion {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr PackedVersion(uint32_t version) : _version(version) {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PackedVersion(unsigned major, unsigned minor, unsigned subminor)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : _version((major << 16) | ((minor & 0xff) << 8) | (subminor & 0xff)) {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PackedVersion(clang::VersionTuple version) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PackedVersion(llvm::VersionTuple version) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _version = version.getMajor() << 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (auto minor = version.getMinor())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _version |= (*minor & 0xff) << 8;
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 5 Jul 2019 13:09:53 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [tapi] Add a missed <vector> header.
</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;'>+ include/tapi/Core/HeaderFile.h | 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 tapi/include/tapi/Core/HeaderFile.h tapi/include/tapi/Core/HeaderFile.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index eaf5f77..baeb610 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/include/tapi/Core/HeaderFile.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/include/tapi/Core/HeaderFile.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "tapi/Defines.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "llvm/ADT/StringRef.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TAPI_NAMESPACE_INTERNAL_BEGIN
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 2 Sep 2018 16:48:58 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [tapi] API changes for ExecuteAndWait().
</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;'>+ lib/Driver/InstallAPIDriver.cpp | 23 ++++++++++++++---------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 14 insertions(+), 9 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/lib/Driver/InstallAPIDriver.cpp tapi/lib/Driver/InstallAPIDriver.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8f5a3be..ddb9454 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/lib/Driver/InstallAPIDriver.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/lib/Driver/InstallAPIDriver.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -331,7 +331,8 @@ getCodeCoverageSymbols(DiagnosticsEngine &diag,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string installDir = toolchainBinDir;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<std::unique_ptr<ExtendedInterfaceFile>> files;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (const auto &target : targets) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const char *clangArgs[] = {"clang",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SmallVector<const char*, 128> ClangArgv =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {"clang",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-target",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target.str().c_str(),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-dynamiclib",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -353,12 +354,16 @@ getCodeCoverageSymbols(DiagnosticsEngine &diag,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FileRemover removeStderrFile(stderrFile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const Optional<StringRef> redirects[] = {/*STDIN=*/llvm::None,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*STDOUT=*/llvm::None,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*STDERR=*/StringRef(stderrFile)};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- bool failed = sys::ExecuteAndWait(clangBinary.get(), clangArgs,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /*env=*/nullptr, redirects);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ StringRef stderrFileStr(stderrFile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ SmallVector<llvm::Optional<StringRef>, 3> Rd =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {/*STDIN=*/ llvm::None,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*STDOUT=*/llvm::None,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /*STDERR=*/StringRef(stderrFile)};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ArrayRef<Optional<StringRef>> Redirects(Rd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Optional<ArrayRef<StringRef>> Env;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ auto Args = llvm::toStringRefArray(ClangArgv.data());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bool failed = sys::ExecuteAndWait(clangBinary.get(), Args,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Env, Redirects);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (failed) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto bufferOr = MemoryBuffer::getFile(stderrFile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -366,8 +371,8 @@ getCodeCoverageSymbols(DiagnosticsEngine &diag,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return make_error<StringError>("unable to read file", ec);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string message = "'clang' invocation failed:\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (auto *arg : clangArgs) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (arg == nullptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (auto arg : Args) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (arg == "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message.append(arg).append(1, ' ');
</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;'>+From 36b039df99f82c5cb1b2eb112b0d1eedfeadea81 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 2 Sep 2018 16:40:25 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [tapi] Diagnostics generation needs declaration of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TextSubstitution class.
</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;'>+ include/tapi/Diagnostics/DiagnosticTAPIKinds.td | 9 +++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 9 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/include/tapi/Diagnostics/DiagnosticTAPIKinds.td tapi/include/tapi/Diagnostics/DiagnosticTAPIKinds.td
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 76eb025..0029221 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/include/tapi/Diagnostics/DiagnosticTAPIKinds.td
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/include/tapi/Diagnostics/DiagnosticTAPIKinds.td
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,6 +7,15 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// Textual substitutions which may be performed on the text of diagnostics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class TextSubstitution<string Text> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ string Substitution = Text;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // TODO: These are only here to allow substitutions to be declared inline with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // diagnostics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ string Component = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ string CategoryName = "";
</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;'>+ // Define the diagnostic severities.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class Severity<string N> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ce3a261
</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-0004-tapi-add-PPC-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0b204f83e9907456deb1a44ab36f08a8362fd6f0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 5 Jul 2019 20:26:06 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] tapi - add ppc and ppc64 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;'>+ include/tapi/Core/Architecture.def | 8 ++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 8 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/include/tapi/Core/Architecture.def tapi/include/tapi/Core/Architecture.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 32b4bb5..37df40f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/include/tapi/Core/Architecture.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/include/tapi/Core/Architecture.def
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,6 +4,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ARCHINFO(arch)
</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;'>++#ifdef SUPPORT_ARCH_PPC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ARCHINFO(ppc, MachO::CPU_TYPE_POWERPC, MachO::CPU_SUBTYPE_POWERPC_ALL)
</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;'>++#ifdef SUPPORT_ARCH_PPC64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ARCHINFO(ppc64, MachO::CPU_TYPE_POWERPC64, MachO::CPU_SUBTYPE_POWERPC_ALL)
</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;'>+ /// X86 architectures sorted by cpu type and sub type id.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ///
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b48f321
</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-0005-tapi-test-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,51 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7b2d305d6c16cbd503a1ad2c2312697e8e484ad6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 2 Sep 2018 16:50:15 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [tapi, test] Allow the use of a specified sysroot.
</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;'>+ test/CMakeLists.txt | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test/lit.cfg | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test/lit.site.cfg.in | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 5 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/test/CMakeLists.txt tapi/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 90fe6c4..50e91c4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/test/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,7 +53,9 @@ ExternalProject_Add(TestInputs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -DCMAKE_SYSROOT=${CMAKE_SYSROOT}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_TYPE=Release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOG_CONFIGURE 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOG_BUILD 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/test/lit.cfg tapi/test/lit.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fd08bbe..92d45a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/test/lit.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/test/lit.cfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -264,7 +264,8 @@ config.inputs = os.path.join(tapi_obj_root, 'Inputs')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.tapi = infer_tapi(config.environment['PATH']).replace('\\', '/')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.tapi_run = infer_tapi_run(config.environment['PATH']).replace('\\', '/')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.tapi_frontend = infer_tapi_frontend(config.environment['PATH']).replace('\\', '/')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-config.sysroot = get_macos_sdk_path(config)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if config.sysroot == '':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ config.sysroot = get_macos_sdk_path(config)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lit_config.note('using SDKROOT: %r' % config.sysroot)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.substitutions.append( ('%inputs', config.inputs) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git tapi/test/lit.site.cfg.in tapi/test/lit.site.cfg.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5e54c18..0fc027b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tapi/test/lit.site.cfg.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tapi/test/lit.site.cfg.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +9,7 @@ config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.tapi_obj_root = "@TAPI_BINARY_DIR@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++config.sysroot = "@TAPI_SYSROOT@"
</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;'>+ # Support substitution of the tools and libs dirs with user parameters. This is
</span></pre><pre style='margin:0'>
</pre>