<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/2d9af30f8c66e1c20194645388a759fda9874c54">https://github.com/macports/macports-ports/commit/2d9af30f8c66e1c20194645388a759fda9874c54</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 2d9af30f8c6 llvm-{16,17,18,19,devel}: fix cmake variable handling
</span>2d9af30f8c6 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 2d9af30f8c66e1c20194645388a759fda9874c54
</span>Author: Mark Mentovai <mark@mentovai.com>
AuthorDate: Fri Sep 27 15:26:04 2024 -0400

<span style='display:block; white-space:pre;color:#404040;'>    llvm-{16,17,18,19,devel}: fix cmake variable handling
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    The Portfiles for these llvm versions were mishandling
</span><span style='display:block; white-space:pre;color:#404040;'>    CMAKE_INSTALL_NAME_DIR in configure.pre_args-delete, failing to delete
</span><span style='display:block; white-space:pre;color:#404040;'>    the intended variable set by the _resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;color:#404040;'>    port group because the port group encloses the value in quotes, but the
</span><span style='display:block; white-space:pre;color:#404040;'>    Portfiles omitted the quotes.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    CMAKE_INSTALL_RPATH was being mishandled in the same way, but because
</span><span style='display:block; white-space:pre;color:#404040;'>    these Portfiles specify cmake.install_rpath as empty, the port group does
</span><span style='display:block; white-space:pre;color:#404040;'>    not set CMAKE_INSTALL_RPATH at all, so the configure.pre_args-delete
</span><span style='display:block; white-space:pre;color:#404040;'>    entry for that variable can be removed from the Portfiles altogether.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    These Portfiles’ configure.pre_args-replace item for
</span><span style='display:block; white-space:pre;color:#404040;'>    CMAKE_SYSTEM_PREFIX_PATH has been updated to reflect the value actually
</span><span style='display:block; white-space:pre;color:#404040;'>    set by the port group.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    For llvm-16 and later, these Portfile updates should not cause any
</span><span style='display:block; white-space:pre;color:#404040;'>    meaningful change to the build output, so these Portfiles’ `revision`
</span><span style='display:block; white-space:pre;color:#404040;'>    fields are not updated. This same change would have impact to llvm-15
</span><span style='display:block; white-space:pre;color:#404040;'>    and earlier. llvm-15 was handled more carefully in #25918, and llvm-14
</span><span style='display:block; white-space:pre;color:#404040;'>    in #25919. A more comprehensive explanation of the change appears at
</span><span style='display:block; white-space:pre;color:#404040;'>    https://github.com/macports/macports-ports/pull/25918#issuecomment-2377971503.
</span>---
 lang/llvm-16/Portfile    |  5 ++---
 lang/llvm-17/Portfile    |  5 ++---
 lang/llvm-18/Portfile    |  7 +++----
 lang/llvm-19/Portfile    |  7 +++----
 lang/llvm-devel/Portfile | 11 +++++------
 5 files changed, 15 insertions(+), 20 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 598e0949509..d08c6980233 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;'>@@ -60,15 +60,14 @@ cmake.build_type        Release
</span> cmake.install_rpath
 
 configure.pre_args-delete \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_INSTALL_NAME_DIR=${cmake.install_prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_INSTALL_RPATH=${cmake.install_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DCMAKE_INSTALL_NAME_DIR="${cmake.install_prefix}/lib"
</span> 
 configure.pre_args-replace \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
 
 configure.pre_args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;/usr" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;${cmake.install_prefix}\;/usr" \
</span>     -DCMAKE_SYSTEM_PREFIX_PATH="${cmake.install_prefix}\;${prefix}\;/usr"
 
 configure.args-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-17/Portfile b/lang/llvm-17/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52cfcce2e57..8db6dfe25e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-17/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-17/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,15 +64,14 @@ cmake.build_type        Release
</span> cmake.install_rpath
 
 configure.pre_args-delete \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_INSTALL_NAME_DIR=${cmake.install_prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_INSTALL_RPATH=${cmake.install_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DCMAKE_INSTALL_NAME_DIR="${cmake.install_prefix}/lib"
</span> 
 configure.pre_args-replace \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
 
 configure.pre_args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;/usr" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;${cmake.install_prefix}\;/usr" \
</span>     -DCMAKE_SYSTEM_PREFIX_PATH="${cmake.install_prefix}\;${prefix}\;/usr"
 
 configure.args-append \
<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 dcdb1a57405..0c4d69595aa 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;'>@@ -64,15 +64,14 @@ cmake.build_type        Release
</span> cmake.install_rpath
 
 configure.pre_args-delete \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_INSTALL_NAME_DIR=${cmake.install_prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_INSTALL_RPATH=${cmake.install_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DCMAKE_INSTALL_NAME_DIR="${cmake.install_prefix}/lib"
</span> 
 configure.pre_args-replace \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
 
 configure.pre_args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;/usr" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;${cmake.install_prefix}\;/usr" \
</span>     -DCMAKE_SYSTEM_PREFIX_PATH="${cmake.install_prefix}\;${prefix}\;/usr"
 
 configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -381,7 +380,7 @@ post-destroot {
</span>         file rename ${destroot}${sub_prefix}/bin/clang-${clang_exe_version} ${destroot}${sub_prefix}/bin/clang
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # If only 'flang-new' created, link to 'flang' 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # If only 'flang-new' created, link to 'flang'
</span>     if {[file exists ${destroot}${sub_prefix}/bin/flang-new]} {
         if {![file exists ${destroot}${sub_prefix}/bin/flang]} {
             ln -s ${sub_prefix}/bin/flang-new ${destroot}${sub_prefix}/bin/flang
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-19/Portfile b/lang/llvm-19/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 73ad02952b0..14ca29548e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-19/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-19/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,15 +64,14 @@ cmake.build_type        Release
</span> cmake.install_rpath
 
 configure.pre_args-delete \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_INSTALL_NAME_DIR=${cmake.install_prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_INSTALL_RPATH=${cmake.install_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DCMAKE_INSTALL_NAME_DIR="${cmake.install_prefix}/lib"
</span> 
 configure.pre_args-replace \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
 
 configure.pre_args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;/usr" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;${cmake.install_prefix}\;/usr" \
</span>     -DCMAKE_SYSTEM_PREFIX_PATH="${cmake.install_prefix}\;${prefix}\;/usr"
 
 configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -376,7 +375,7 @@ post-destroot {
</span>         file rename ${destroot}${sub_prefix}/bin/clang-${clang_exe_version} ${destroot}${sub_prefix}/bin/clang
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # If only 'flang-new' created, link to 'flang' 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # If only 'flang-new' created, link to 'flang'
</span>     if {[file exists ${destroot}${sub_prefix}/bin/flang-new]} {
         if {![file exists ${destroot}${sub_prefix}/bin/flang]} {
             ln -s ${sub_prefix}/bin/flang-new ${destroot}${sub_prefix}/bin/flang
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-devel/Portfile b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6bd1ad942ac..4024d010640 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,15 +77,14 @@ cmake.build_type        Release
</span> cmake.install_rpath
 
 configure.pre_args-delete \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_INSTALL_NAME_DIR=${cmake.install_prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_INSTALL_RPATH=${cmake.install_prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DCMAKE_INSTALL_NAME_DIR="${cmake.install_prefix}/lib"
</span> 
 configure.pre_args-replace \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
     -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
 
 configure.pre_args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;/usr" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    -DCMAKE_SYSTEM_PREFIX_PATH="${prefix}\;${cmake.install_prefix}\;/usr" \
</span>     -DCMAKE_SYSTEM_PREFIX_PATH="${cmake.install_prefix}\;${prefix}\;/usr"
 
 configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -156,9 +155,9 @@ patchfiles-append \
</span>     0019-10.6-and-less-use-emulated-TLS-before-10.7.patch \
     0025-lldb-add-defines-needed-for-older-SDKs.patch
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# patches that longer apply when cloned from llvmm-17. To be seen if needed still.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 0010-compiler-rt-cmake-config-ix.cmake-was-Leopard-No-ASA.patch 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 0011-Fix-missing-long-long-math-prototypes-when-using-the.patch 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# patches that longer apply when cloned from llvm-17. To be seen if needed still.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 0010-compiler-rt-cmake-config-ix.cmake-was-Leopard-No-ASA.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# 0011-Fix-missing-long-long-math-prototypes-when-using-the.patch
</span> 
 if {${os.platform} eq "darwin" && ${os.major} < 14} {
     patchfiles-append \
</pre><pre style='margin:0'>

</pre>