<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/591281e65e78a032c11b8d39bf1e82a617ad2ab5">https://github.com/macports/macports-ports/commit/591281e65e78a032c11b8d39bf1e82a617ad2ab5</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 591281e65e7 clang-16: revert change that breaks rpath linkages in clang runtime
</span>591281e65e7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 591281e65e78a032c11b8d39bf1e82a617ad2ab5
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Jul 1 18:58:06 2023 -0700
<span style='display:block; white-space:pre;color:#404040;'> clang-16: revert change that breaks rpath linkages in clang runtime
</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/67686
</span>---
lang/llvm-16/Portfile | 8 +++++++-
.../b98da4c71edda3df0a0555b1ab63ec52e92252b4-inverse.patch | 13 +++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
<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 7635e20bc4d..cfda2ab5893 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;'>@@ -28,7 +28,7 @@ version ${llvm_version}.0.6
</span> name llvm-${llvm_version}
revision 0
subport mlir-${llvm_version} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport clang-${llvm_version} { revision [ expr ${revision} + 0 ] }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport clang-${llvm_version} { revision [ expr ${revision} + 1 ] }
</span> subport lldb-${llvm_version} { revision [ expr ${revision} + 0 ] }
subport flang-${llvm_version} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,6 +192,12 @@ if {${os.platform} eq "darwin" && ${os.major} < 12} {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/67686
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# revert commit that breaks rpath linkages in clang runtime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append b98da4c71edda3df0a0555b1ab63ec52e92252b4-inverse.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
reinplace "s|@@PREFIX@@|${prefix}|" \
${patch.dir}/clang/lib/Driver/ToolChains/Clang.cpp \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/llvm-16/files/b98da4c71edda3df0a0555b1ab63ec52e92252b4-inverse.patch b/lang/llvm-16/files/b98da4c71edda3df0a0555b1ab63ec52e92252b4-inverse.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ea8a5899805
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/llvm-16/files/b98da4c71edda3df0a0555b1ab63ec52e92252b4-inverse.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -392,8 +392,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(${libname} PRIVATE ${builtins_${libname}})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(${type} STREQUAL "SHARED")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(COMMAND llvm_setup_rpath)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ llvm_setup_rpath(${libname})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(APPLE OR WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_property(TARGET ${libname} PROPERTY BUILD_WITH_INSTALL_RPATH ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WIN32 AND NOT CYGWIN AND NOT MINGW)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "")
</span></pre><pre style='margin:0'>
</pre>