<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/e71239c4dcced07e3196fcbc5cab241d25ca81d7">https://github.com/macports/macports-ports/commit/e71239c4dcced07e3196fcbc5cab241d25ca81d7</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 e71239c4dcc LLVM 18: remove LLVM_CREATE_XCODE_TOOLCHAIN=ON
</span>e71239c4dcc is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e71239c4dcced07e3196fcbc5cab241d25ca81d7
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat Jul 6 15:35:25 2024 +0100
<span style='display:block; white-space:pre;color:#404040;'> LLVM 18: remove LLVM_CREATE_XCODE_TOOLCHAIN=ON
</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/70333
</span>---
lang/gcc14/Portfile | 10 +++++-----
lang/llvm-18/Portfile | 7 +++++--
2 files changed, 10 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc14/Portfile b/lang/gcc14/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7fe28c3c3c5..f8227072abc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,16 +84,16 @@ if {${subport} eq ${name} && ${build_arch} ne "i386"} {
</span> proc get_clean_sysroot {} {
global configure.sdkroot configure.sdk_version
set new_sdk ${configure.sdkroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [regexp {MacOSX(.*).sdk} ${configure.sdkroot} -> sdk_v] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${sdk_v} != "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [regexp {MacOSX([1-9]\.[0-9]).sdk} ${configure.sdkroot} -> sdk_v] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if { ${sdk_v} != "" } {
</span> # If present strip minor version from SDK version
set sdk_major [lindex [split $sdk_v .] 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug "Detected versioned SDK ${sdk_v} ${sdk_major} ${configure.sdkroot}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Detected versioned SDK ${sdk_v} ${sdk_major} ${configure.sdkroot}"
</span> set new_sdk [regsub {MacOSX1[1-9]\.[0-9]+\.sdk} ${configure.sdkroot} MacOSX${sdk_major}.sdk]
if { ${new_sdk} != ${configure.sdkroot} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_debug " New SDK ${new_sdk}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg " New SDK ${new_sdk}"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #}
</span> }
return ${new_sdk}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-18/Portfile b/lang/llvm-18/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 77ba38da0cd..30a48323508 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-18/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,8 +82,11 @@ configure.args-append \
</span> -DLLVM_INCLUDE_EXAMPLES=OFF \
-DLLVM_ENABLE_FFI=ON \
-DFFI_INCLUDE_DIR=${prefix}/include \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DFFI_LIBRARY_DIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLLVM_CREATE_XCODE_TOOLCHAIN=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFFI_LIBRARY_DIR=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove for now. See https://trac.macports.org/ticket/70333
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Probably need to detect when Xcode is available ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DLLVM_CREATE_XCODE_TOOLCHAIN=ON
</span>
# Disable iOS support
# To Be reviewed with later versions
</pre><pre style='margin:0'>
</pre>