<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/c8ea54857743c109700c36af60c0a2582325cf60">https://github.com/macports/macports-ports/commit/c8ea54857743c109700c36af60c0a2582325cf60</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 c8ea5485774 lldb-13, mlir-13, flang-13: enable on macOS ≥ 14
</span>c8ea5485774 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c8ea54857743c109700c36af60c0a2582325cf60
</span>Author: Mark Mentovai <mark@mentovai.com>
AuthorDate: Tue Oct 1 09:49:42 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> lldb-13, mlir-13, flang-13: enable on macOS ≥ 14
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 93df94134805 (as fixed by c04f7bf1e4b0) must be made to apply to
</span><span style='display:block; white-space:pre;color:#404040;'> flang-13 in addition to clang-13, because the sanitizer runtimes are
</span><span style='display:block; white-space:pre;color:#404040;'> built for both.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> flang-mp-13 delegates to a bash wrapper script that uses modern
</span><span style='display:block; white-space:pre;color:#404040;'> bash-isms not supported by bash-3.2 shipped by Apple in /bin. A run-time
</span><span style='display:block; white-space:pre;color:#404040;'> dependency on the bash port is added, and the wrapper script is patched
</span><span style='display:block; white-space:pre;color:#404040;'> to use MacPorts’ bash as its interpreter rather than whatever happens to
</span><span style='display:block; white-space:pre;color:#404040;'> be first in the PATH.
</span>---
lang/llvm-13/Portfile | 43 ++++++++++++++++++++++++-------------------
1 file changed, 24 insertions(+), 19 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-13/Portfile b/lang/llvm-13/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4593d7616fc..955ce140eaf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-13/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ revision 2
</span> subport mlir-${llvm_version} { revision 0 }
subport clang-${llvm_version} { revision 4 }
subport lldb-${llvm_version} { revision 2 }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport flang-${llvm_version} { revision 0 }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport flang-${llvm_version} { revision 1 }
</span>
checksums rmd160 ae542658ad0e97b4bf088b1cfba66fa10b9b52d8 \
sha256 326335a830f2e32d06d0a36393b5455d17dc73e0bd1211065227ee014f92cbf8 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -263,12 +263,17 @@ if { ${subport} eq "flang-${llvm_version}" } {
</span> # has to match mlir's archs
supported_archs arm64 x86_64
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -E "1s|^#!.*$|#!${prefix}/bin/bash|" ${worksrcpath}/../flang/tools/f18/flang.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DLLVM_ENABLE_PROJECTS="clang\;flang\;compiler-rt\;mlir" \
-DLIBCXX_ENABLE_SHARED=OFF \
-DLIBCXX_INSTALL_LIBRARY=OFF
depends_lib-append port:clang-${llvm_version} port:mlir-${llvm_version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run-append port:bash
</span>
destroot {
# we have to run the destroot like this, because individual targets for each of the
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -288,7 +293,7 @@ if { ${subport} eq "flang-${llvm_version}" } {
</span> if { ${subport} eq "mlir-${llvm_version}" ||
${subport} eq "flang-${llvm_version}" } {
# temporarily restrict to newer systems until older systems can be rigorously vetted
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms {darwin >= 10} {darwin < 23}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platforms {darwin >= 10}
</span> }
if { ${subport} eq "clang-${llvm_version}" || ${subport} eq "flang-${llvm_version}" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -339,6 +344,22 @@ if { ${subport} eq "clang-${llvm_version}" || ${subport} eq "flang-${llvm_versio
</span> configure.args-append -DCLANG_ENABLE_CLANGD=OFF \
-DLLVM_ENABLE_BACKTRACES=OFF
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # -Wl,-syslibroot referencing the macOS SDK must not appear when linking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # runtime libraries for non-macOS platforms, which are cross-built and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # used for cross-platform support. The clang/flang build will provide
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the proper -isysroot for the platform in these cases. Remove the macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # SDK.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach rtl {asan lsan stats tsan ubsan ubsan_minimal} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach rtl_os {ios iossim} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set link_txt_path "${workpath}/build/projects/compiler-rt/lib/${rtl}/CMakeFiles/clang_rt.${rtl}_${rtl_os}_dynamic.dir/link.txt"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists "${link_txt_path}"]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-Wl,-syslibroot,${configure.sdkroot}||" "${link_txt_path}"
</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;'>+ }
</span> }
if {${subport} eq "lldb-${llvm_version}"} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -356,7 +377,7 @@ if {${subport} eq "lldb-${llvm_version}"} {
</span> select.file ${filespath}/mp-${subport}
# error: use of undeclared identifier 'CPU_SUBTYPE_ARM64E
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms {darwin >= 18} {darwin < 23}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platforms {darwin >= 18}
</span>
configure.args-append \
-DLLDB_CODESIGN_IDENTITY=- \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -538,22 +559,6 @@ if {${subport} eq "clang-${llvm_version}"} {
</span> if { ${cxx_stdlib} eq "libstdc++" } {
default_variants-append +libstdcxx
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -Wl,-syslibroot referencing the macOS SDK must not appear when linking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # runtime libraries for non-macOS platforms, which are cross-built and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # used for cross-platform support. The clang build will provide the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # proper -isysroot for the platform in these cases. Remove the macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # SDK.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach rtl {asan lsan stats tsan ubsan ubsan_minimal} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach rtl_os {ios iossim} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set link_txt_path "${workpath}/build/projects/compiler-rt/lib/${rtl}/CMakeFiles/clang_rt.${rtl}_${rtl_os}_dynamic.dir/link.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file exists "${link_txt_path}"]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-Wl,-syslibroot,${configure.sdkroot}||" "${link_txt_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> }
livecheck.type regex
</pre><pre style='margin:0'>
</pre>