[pkgsrc/trunk]: pkgsrc/devel/py-meson py-meson: restore calling install_name_...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/198322f357fc
branches:  trunk
changeset: 396658:198322f357fc
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jun 06 05:40:50 2019 +0000

description:
py-meson: restore calling install_name_tool on Darwin

diffstat:

 devel/py-meson/distinfo                                     |   4 +-
 devel/py-meson/patches/patch-mesonbuild_minstall.py         |  22 -------------
 devel/py-meson/patches/patch-mesonbuild_scripts_depfixer.py |  15 ++++++++
 3 files changed, 17 insertions(+), 24 deletions(-)

diffs (60 lines):

diff -r ba60bf9c5bd4 -r 198322f357fc devel/py-meson/distinfo
--- a/devel/py-meson/distinfo   Thu Jun 06 05:39:45 2019 +0000
+++ b/devel/py-meson/distinfo   Thu Jun 06 05:40:50 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2019/05/22 09:52:52 prlw1 Exp $
+$NetBSD: distinfo,v 1.20 2019/06/06 05:40:50 adam Exp $
 
 SHA1 (meson-0.50.1.tar.gz) = 252175efb8fdaff0e815cfbef1be14f8fbd5b66c
 RMD160 (meson-0.50.1.tar.gz) = 483329d8c8d1087951a7839cd04a9c230ad86fa4
@@ -6,4 +6,4 @@
 Size (meson-0.50.1.tar.gz) = 1402160 bytes
 SHA1 (patch-mesonbuild_compilers_compilers.py) = 6b1be661a9fe97e55cf394ff06a33fe72c85f434
 SHA1 (patch-mesonbuild_environment.py) = f599ec7c708037002da5d9ee4ca0ccfb31b2e307
-SHA1 (patch-mesonbuild_minstall.py) = 64bcbdac0d37cabd114349de34646820893bb212
+SHA1 (patch-mesonbuild_scripts_depfixer.py) = 6ed6fdfd7454b517ad5d1ebd1c387ebd73437d4b
diff -r ba60bf9c5bd4 -r 198322f357fc devel/py-meson/patches/patch-mesonbuild_minstall.py
--- a/devel/py-meson/patches/patch-mesonbuild_minstall.py       Thu Jun 06 05:39:45 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-mesonbuild_minstall.py,v 1.2 2019/03/05 16:30:18 prlw1 Exp $
-
-Don't touch rpath.
-
---- mesonbuild/minstall.py.orig        2019-01-23 16:46:09.000000000 +0000
-+++ mesonbuild/minstall.py
-@@ -476,15 +476,6 @@ class Installer:
-                         print("Symlink creation does not work on this platform. "
-                               "Skipping all symlinking.")
-                         printed_symlink_error = True
--            if os.path.isfile(outname):
--                try:
--                    depfixer.fix_rpath(outname, install_rpath, final_path,
--                                       install_name_mappings, verbose=False)
--                except SystemExit as e:
--                    if isinstance(e.code, int) and e.code == 0:
--                        pass
--                    else:
--                        raise
- 
- def run(opts):
-     datafilename = 'meson-private/install.dat'
diff -r ba60bf9c5bd4 -r 198322f357fc devel/py-meson/patches/patch-mesonbuild_scripts_depfixer.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/py-meson/patches/patch-mesonbuild_scripts_depfixer.py       Thu Jun 06 05:40:50 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-mesonbuild_scripts_depfixer.py,v 1.1 2019/06/06 05:40:50 adam Exp $
+
+Do not touch rpath for ELF.
+
+--- mesonbuild/scripts/depfixer.py.orig        2019-06-06 05:17:20.000000000 +0000
++++ mesonbuild/scripts/depfixer.py
+@@ -439,8 +439,6 @@ def fix_rpath(fname, new_rpath, final_pa
+         if fname.endswith('.jar'):
+             fix_jar(fname)
+             return
+-        fix_elf(fname, new_rpath, verbose)
+-        return
+     except SystemExit as e:
+         if isinstance(e.code, int) and e.code == 0:
+             pass