<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7bbee9a3a2a8a25a85d7ead7a4da58ee71f70d2c">https://github.com/macports/macports-ports/commit/7bbee9a3a2a8a25a85d7ead7a4da58ee71f70d2c</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 7bbee9a3a2a py-meson: upstream patch to fix install_name_tool issue
</span>7bbee9a3a2a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7bbee9a3a2a8a25a85d7ead7a4da58ee71f70d2c
</span>Author: christophecvr <stefansat@proximus.be>
AuthorDate: Wed Jul 24 16:16:42 2024 +0200
<span style='display:block; white-space:pre;color:#404040;'> py-meson: upstream patch to fix install_name_tool issue
</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/70394
</span>---
python/py-meson/Portfile | 8 ++++++-
.../files/duplicate-rpath-delete-darwin-fix.diff | 28 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/Portfile b/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a430bf55dd0..909540baa47 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ name py-meson
</span> # update version and revision also in the meson port
github.setup mesonbuild meson 1.5.0
github.tarball_from releases
<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 a344eeb69d38eff4e54334caf1ca25941b08a6f4 \
sha256 45d7b8653c1e5139df35b33be2dd5b2d040c5b2c6129f9a7c890d507e33312b8 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,6 +71,12 @@ if {${subport} ne ${name}} {
</span>
# add a search path for crossfiles in our prefix
patchfiles-append patch-meson-search-prefix-for-cross-files.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # temporary fix for the destroot failure on a lot of packages using meson build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Since version release 1.5.0 on darwin platform.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/70394#comment:5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append duplicate-rpath-delete-darwin-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>
platform darwin 8 {
# this meson is modified for systems without @rpath support
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-meson/files/duplicate-rpath-delete-darwin-fix.diff b/python/py-meson/files/duplicate-rpath-delete-darwin-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..accabb65d47
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-meson/files/duplicate-rpath-delete-darwin-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/scripts/depfixer.py.orig 2024-07-01 17:31:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/scripts/depfixer.py 2024-07-24 12:56:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -379,11 +379,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # note: e.get_rpath() and e.get_runpath() may be useful
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ e.fix_rpath(fname, rpath_dirs_to_remove, new_rpath)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-def get_darwin_rpaths(fname: str) -> T.List[str]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++def get_darwin_rpaths(fname: str) -> OrderedSet[str]:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p, out, _ = Popen_safe(['otool', '-l', fname], stderr=subprocess.DEVNULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if p.returncode != 0:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ raise subprocess.CalledProcessError(p.returncode, p.args, out)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result = []
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Need to deduplicate rpaths, as macOS's install_name_tool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # is *very* allergic to duplicate -delete_rpath arguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # when calling depfixer on installation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result = OrderedSet()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ current_cmd = 'FOOBAR'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for line in out.split('\n'):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ line = line.strip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -394,7 +397,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ current_cmd = value
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if key == 'path' and current_cmd == 'LC_RPATH':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rp = value.split('(', 1)[0].strip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- result.append(rp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result.add(rp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return result
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def fix_darwin(fname: str, rpath_dirs_to_remove: T.Set[bytes], new_rpath: str, final_path: str, install_name_mappings: T.Dict[str, str]) -> None:
</span></pre><pre style='margin:0'>
</pre>