<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5ab736d24597e55216bde0ffa4ed05e31be1e112">https://github.com/macports/macports-ports/commit/5ab736d24597e55216bde0ffa4ed05e31be1e112</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 5ab736d2459 kcov: add rpath for LLDB
</span>5ab736d2459 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5ab736d24597e55216bde0ffa4ed05e31be1e112
</span>Author: Brendan Cully <brendan@cully.org>
AuthorDate: Sat Nov 27 18:56:12 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> kcov: add rpath for LLDB
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> On at least OS X 11 and 12 (all I have available for testing now),
</span><span style='display:block; white-space:pre;color:#404040;'> kcov currently fails to start:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> ```
</span><span style='display:block; white-space:pre;color:#404040;'> dyld[3855]: Library not loaded: @rpath/LLDB.framework/Versions/A/LLDB
</span><span style='display:block; white-space:pre;color:#404040;'> Referenced from: /opt/local/bin/kcov
</span><span style='display:block; white-space:pre;color:#404040;'> Reason: tried: '/opt/local/lib/LLDB.framework/Versions/A/LLDB' (no such file), '/opt/local/lib/LLDB.framework/Versions/A/LLDB' (no such file), '/Library/Frameworks/LLDB.framework/Versions/A/LLDB' (no such file), '/System/Library/Frameworks/LLDB.framework/Versions/A/LLDB' (no such file)
</span><span style='display:block; white-space:pre;color:#404040;'> ```
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The cause is that the kcov build script attempts to replace the rpath
</span><span style='display:block; white-space:pre;color:#404040;'> @rpath/LLDB.framework/LLDB instead of @rpath/LLDB.framework/Versions/A/LLDB.
</span><span style='display:block; white-space:pre;color:#404040;'> It is possible that the original path is correct on older versions of macOS,
</span><span style='display:block; white-space:pre;color:#404040;'> so I've opted to just attempt to change both locations here.
</span>---
devel/kcov/Portfile | 5 +++--
devel/kcov/files/kcov-lldb-rpath.patch | 11 +++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/kcov/Portfile b/devel/kcov/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c641eab29c2..28575573835 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/kcov/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/kcov/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup legacysupport 1.0
</span> legacysupport.newest_darwin_requires_legacy 14
github.setup SimonKagstrom kcov 38 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 7bc2dfb463ec46c5ae541894fc522c18a615e9f2 \
sha256 b37af60d81a9b1e3b140f9473bdcb7975af12040feb24cc666f9bb2bb0be68b4 \
size 306098
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,8 @@ depends_build-append \
</span> depends_lib-append port:curl \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles bin-to-c-source.py.use-python38.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles bin-to-c-source.py.use-python38.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kcov-lldb-rpath.patch
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/src/bin-to-c-source.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/kcov/files/kcov-lldb-rpath.patch b/devel/kcov/files/kcov-lldb-rpath.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dfcfef49933
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/kcov/files/kcov-lldb-rpath.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig 2021-12-07 21:15:06.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2021-12-07 21:32:38.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -443,7 +443,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(LLDB_LIBRARY_INSTALL_NAME "${LLDB_LIBRARY}/Versions/Current/LLDB")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_command(TARGET ${KCOV}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ POST_BUILD COMMAND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "${CMAKE_INSTALL_NAME_TOOL}" -change @rpath/LLDB.framework/LLDB "${LLDB_LIBRARY_INSTALL_NAME}" $<TARGET_FILE:${KCOV}>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "${CMAKE_INSTALL_NAME_TOOL}" -change @rpath/LLDB.framework/LLDB "${LLDB_LIBRARY_INSTALL_NAME}" -change @rpath/LLDB.framework/Versions/A/LLDB "${LLDB_LIBRARY_INSTALL_NAME}" $<TARGET_FILE:${KCOV}>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMENT "Changing LLDB install name from @rpath/LLDB.framework/LLDB to ${LLDB_LIBRARY_INSTALL_NAME}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span></pre><pre style='margin:0'>
</pre>