<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f24c361e09c3ade70c2b0c9a79aead833c91b73e">https://github.com/macports/macports-ports/commit/f24c361e09c3ade70c2b0c9a79aead833c91b73e</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 f24c361e09c LLVM 16: Fix libc++ link step to correct use legacysupport when required
</span>f24c361e09c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f24c361e09c3ade70c2b0c9a79aead833c91b73e
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Mar 24 13:59:41 2023 +0000
<span style='display:block; white-space:pre;color:#404040;'> LLVM 16: Fix libc++ link step to correct use legacysupport when required
</span>---
lang/llvm-16/Portfile | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-16/Portfile b/lang/llvm-16/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0c71efbdfe8..f8f82143885 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-16/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,17 +16,6 @@ legacysupport.use_static yes
</span> # Sysconf wrapping causes issues so disable
legacysupport.disable_function_wrap yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# libc++ link step fails on OSX10.10 and older to correctly use static legacy support lib.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# So force it to find it via compiler wrapping
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup compiler_wrapper 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cc [compwrap::wrap_compiler cc]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxx [compwrap::wrap_compiler cxx]
</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> categories lang
platforms darwin
license NCSA
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,8 +49,8 @@ worksrcdir ${worksrcdir}/llvm
</span> compiler.blacklist *gcc* {clang < 1001} macports-clang-3.*
# work/build/include/c++/v1/optional:224:5: error: destructor cannot be marked constexpr
# _LIBCPP_CONSTEXPR_AFTER_CXX17 ~__optional_destruct_base()
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {clang < 1204} {macports-clang-[5-9].0} {macports-clang-1[0-2]}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.fallback clang macports-clang-13 macports-clang-14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 1204} {macports-clang-[5-9].0} {macports-clang-1[0-3]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.fallback clang macports-clang-14 macports-clang-15
</span>
# We can't use Ninja with our custom destrooting plan for llvm
#cmake.generator Ninja
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -199,6 +188,13 @@ post-patch {
</span> ${patch.dir}/clang/tools/clang-format/clang-format.py
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# libc++ link step fails on OSX10.10 and older to correctly use static legacy support lib.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|LIBCXX_LIBRARIES \"\"|LIBCXX_LIBRARIES \"[legacysupport::get_library_link_flags]\"|" ${worksrcpath}/../libcxx/CMakeLists.txt
</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> if {${subport} eq "llvm-${llvm_version}"} {
homepage https://llvm.org/
</pre><pre style='margin:0'>
</pre>