CVS commit: pkgsrc/devel/py-meson

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Feb 25 20:27:42 UTC 2018

Modified Files:
        pkgsrc/devel/py-meson: Makefile distinfo
Added Files:
        pkgsrc/devel/py-meson/patches:
            patch-mesonbuild_scripts_meson__install.py

Log Message:
py-meson: add workaround for rpath stripping.

By default, meson strips all rpaths, see
https://github.com/mesonbuild/meson/issues/314

Remove the stripping (which might leave build rpaths inside installed binaries
but at least gives us runnable binaries) until meson fixes this properly.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/py-meson/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-meson/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-meson/patches/patch-mesonbuild_scripts_meson__install.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-meson/Makefile
diff -u pkgsrc/devel/py-meson/Makefile:1.8 pkgsrc/devel/py-meson/Makefile:1.9
--- pkgsrc/devel/py-meson/Makefile:1.8  Sun Feb 25 20:17:42 2018
+++ pkgsrc/devel/py-meson/Makefile      Sun Feb 25 20:27:41 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2018/02/25 20:17:42 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/02/25 20:27:41 wiz Exp $
 
 DISTNAME=      meson-0.44.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 

Index: pkgsrc/devel/py-meson/distinfo
diff -u pkgsrc/devel/py-meson/distinfo:1.6 pkgsrc/devel/py-meson/distinfo:1.7
--- pkgsrc/devel/py-meson/distinfo:1.6  Sun Feb 25 20:17:42 2018
+++ pkgsrc/devel/py-meson/distinfo      Sun Feb 25 20:27:41 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2018/02/25 20:17:42 wiz Exp $
+$NetBSD: distinfo,v 1.7 2018/02/25 20:27:41 wiz Exp $
 
 SHA1 (meson-0.44.1.tar.gz) = 7ac668ee883c4075aa5348e5daedf4c737a6925d
 RMD160 (meson-0.44.1.tar.gz) = 1257a3e2b5f6837a59ef4cdf632a00bba1ff601d
 SHA512 (meson-0.44.1.tar.gz) = 3c350d1752ae4463ec47060e051d79cc0855385e9552deff34fad8431175fb5d0f04b51a242f8f8f737726d06e504339d6b02a5aa9558ee673fb867dbb4e5b2d
 Size (meson-0.44.1.tar.gz) = 1136337 bytes
+SHA1 (patch-mesonbuild_scripts_meson__install.py) = 2a3185ac5814a23040ebe44b21c45c0115daa7ed

Added files:

Index: pkgsrc/devel/py-meson/patches/patch-mesonbuild_scripts_meson__install.py
diff -u /dev/null pkgsrc/devel/py-meson/patches/patch-mesonbuild_scripts_meson__install.py:1.1
--- /dev/null   Sun Feb 25 20:27:42 2018
+++ pkgsrc/devel/py-meson/patches/patch-mesonbuild_scripts_meson__install.py    Sun Feb 25 20:27:41 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-mesonbuild_scripts_meson__install.py,v 1.1 2018/02/25 20:27:41 wiz Exp $
+
+This is an incorrect fix to the problem that meson strips out all rpaths.
+For a longer discussion, see https://github.com/mesonbuild/meson/issues/314
+
+--- mesonbuild/scripts/meson_install.py.orig   2018-02-20 21:48:57.000000000 +0000
++++ mesonbuild/scripts/meson_install.py
+@@ -353,7 +353,6 @@ def install_targets(d):
+         if is_elf_platform() and os.path.isfile(outname):
+             try:
+                 e = depfixer.Elf(outname, False)
+-                e.fix_rpath(install_rpath)
+             except SystemExit as e:
+                 if isinstance(e.code, int) and e.code == 0:
+                     pass