<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/535f48186988109078802144f7c3f6f04a8d99c6">https://github.com/macports/macports-ports/commit/535f48186988109078802144f7c3f6f04a8d99c6</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 535f481  meson: Fix depfixer
</span>535f481 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 535f48186988109078802144f7c3f6f04a8d99c6
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue May 15 03:42:08 2018 -0500

<span style='display:block; white-space:pre;color:#404040;'>    meson: Fix depfixer
</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/56483
</span>---
 devel/meson/Portfile             |  3 +++
 devel/meson/files/depfixer.patch | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/Portfile b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84ce4cc..c88e836 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup           python 1.0
</span> PortGroup           github 1.0
 
 github.setup        mesonbuild meson 0.46.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> license             Apache-2
 categories          devel python
 maintainers         nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,6 +39,8 @@ depends_build-append \
</span> depends_lib-append \
                     port:ninja
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles          depfixer.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
     set python_prefix ${frameworks_dir}/Python.framework/Versions/${python.branch}
     foreach bname {meson mesonconf mesonintrospect mesontest wraptool} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/files/depfixer.patch b/devel/meson/files/depfixer.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..014e4a3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/files/depfixer.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix depfixer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/mesonbuild/meson/issues/3493
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/mesonbuild/meson/commit/d7014d1cb27c432ed35290831f7fedd301bb481e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mesonbuild/scripts/depfixer.py.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mesonbuild/scripts/depfixer.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -347,7 +347,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+             e.fix_rpath(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_to_remove(fname):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    out = subprocess.check_output(['otool', '-l', fname], universal_newlines=True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    out = subprocess.check_output(['otool', '-l', fname],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                  universal_newlines=True,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                  stderr=subprocess.DEVNULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     result = []
</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;'>+@@ -371,9 +373,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         for rp in rpaths:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            subprocess.check_call(['install_name_tool', '-delete_rpath', rp, fname])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-        if new_rpath != '':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-            subprocess.check_call(['install_name_tool', '-add_rpath', new_rpath, fname])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            subprocess.check_call(['install_name_tool', '-delete_rpath', rp, fname],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                  stdout=subprocess.DEVNULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                  stderr=subprocess.DEVNULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++        if new_rpath:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++            subprocess.check_call(['install_name_tool', '-add_rpath', new_rpath, fname],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                  stdout=subprocess.DEVNULL,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++                                  stderr=subprocess.DEVNULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     except Exception as e:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         raise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         sys.exit(0)
</span></pre><pre style='margin:0'>

</pre>