pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc py-meson: Centralise meson_post_install.p...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/61d3dc2ee4ab
branches:  trunk
changeset: 307962:61d3dc2ee4ab
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Tue May 15 08:58:39 2018 +0000
description:
py-meson: Centralise meson_post_install.py handling.

This appears to be a common problem across packages that use meson,
though it's unclear at this time why this doesn't seem to be a problem
for anyone else.

diffstat:

 devel/py-meson/build.mk      |  5 ++++-
 net/glib-networking/Makefile |  5 +----
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r c0fc70fc6187 -r 61d3dc2ee4ab devel/py-meson/build.mk
--- a/devel/py-meson/build.mk   Tue May 15 08:37:38 2018 +0000
+++ b/devel/py-meson/build.mk   Tue May 15 08:58:39 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.4 2018/03/17 11:39:01 tnn Exp $
+# $NetBSD: build.mk,v 1.5 2018/05/15 08:58:39 jperkin Exp $
 
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-meson-[0-9]*:../../devel/py-meson
 
@@ -14,6 +14,9 @@
 
 do-install: meson-install
 meson-install:
+       if [ -f ${WRKSRC}/meson_post_install.py ]; then         \
+               ${CHMOD} +x ${WRKSRC}/meson_post_install.py;    \
+       fi
        cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ninja -C output install
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
diff -r c0fc70fc6187 -r 61d3dc2ee4ab net/glib-networking/Makefile
--- a/net/glib-networking/Makefile      Tue May 15 08:37:38 2018 +0000
+++ b/net/glib-networking/Makefile      Tue May 15 08:58:39 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2018/05/14 09:44:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2018/05/15 08:58:39 jperkin Exp $
 
 DISTNAME=      glib-networking-2.56.0
 PKGREVISION=   3
@@ -19,9 +19,6 @@
 REPLACE_PYTHON+=       find-ca-certificates
 REPLACE_PYTHON+=       meson_post_install.py
 
-pre-install:
-       ${CHMOD} +x ${WRKSRC}/meson_post_install.py
-
 BUILDLINK_API_DEPENDS.glib2+=          glib2>=2.56.0
 .include "../../devel/glib2/modules.mk"
 BUILDLINK_API_DEPENDS.libproxy+=       libproxy>=0.3.1



Home | Main Index | Thread Index | Old Index