<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/d32d13a8f68b1aa83e7e5716a26ebead7220aae5">https://github.com/macports/macports-ports/commit/d32d13a8f68b1aa83e7e5716a26ebead7220aae5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d32d13a8f68b1aa83e7e5716a26ebead7220aae5
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Fri Sep 2 18:57:00 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> libtapi: fixed build on old macOS
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> `clang_dependency` PG blacklists all clang 5+ and with restriction on
</span><span style='display:block; white-space:pre;color:#404040;'> Portfile it makes all compilers are blacklisted.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Instead enforce `clang-11-bootstrap` when it is available.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/65757
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64605
</span>---
devel/libtapi/Portfile | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 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 6cdb6c29fa9..7d4a7d1243a 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,7 +3,6 @@
</span> PortSystem 1.0
PortGroup cmake 1.1
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup clang_dependency 1.0
</span> PortGroup github 1.0
github.setup tpoechtrager apple-libtapi b7b5bdbfda9e8062d405b48da3b811afad98ae76
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,8 +48,7 @@ configure.args-append -DLLVM_ENABLE_ZLIB=OFF
</span> # avoid opportunistic linking ncuses
configure.args-append -DLLVM_ENABLE_TERMINFO=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span> 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:#e0e0e0;'>@@ -86,15 +84,27 @@ if {[string match macports-clang-* ${configure.compiler}]} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# on macOS before 10.12 use clang-11-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 16 && ${build_arch} ni [list ppc ppc64]} {
</span>
# use cmake-bootstrap to minimize dependencies.
depends_build-replace path:bin/cmake:cmake port:cmake-bootstrap
configure.cmd ${prefix}/libexec/cmake-bootstrap/bin/cmake
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.compiler.add_deps no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:clang-11-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_skip_archcheck-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clang-11-bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cc ${prefix}/libexec/clang-11-bootstrap/bin/clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxx ${prefix}/libexec/clang-11-bootstrap/bin/clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cxx_stdlib libc++
depends_lib-append port:libcxx
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> # Proxy for eliminating the dependency on native TLS
# http://trac.macports.org/ticket/46887
configure.args-append -DLLVM_ENABLE_BACKTRACES=OFF
</pre><pre style='margin:0'>
</pre>