pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/meson meson: Backport fix for executable bit tests.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2da360895210
branches:  trunk
changeset: 345378:2da360895210
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Dec 11 12:45:29 2019 +0000

description:
meson: Backport fix for executable bit tests.

Bump PKGREVISION.

diffstat:

 devel/meson/Makefile                                      |   3 +-
 devel/meson/distinfo                                      |   3 +-
 devel/meson/patches/patch-mesonbuild_dependencies_base.py |  27 +++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diffs (57 lines):

diff -r 235e84aedfaa -r 2da360895210 devel/meson/Makefile
--- a/devel/meson/Makefile      Wed Dec 11 10:45:16 2019 +0000
+++ b/devel/meson/Makefile      Wed Dec 11 12:45:29 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2019/10/18 09:59:46 nia Exp $
+# $NetBSD: Makefile,v 1.4 2019/12/11 12:45:29 jperkin Exp $
 
 DISTNAME=      meson-0.52.0
+PKGREVISION=   1
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}
 
diff -r 235e84aedfaa -r 2da360895210 devel/meson/distinfo
--- a/devel/meson/distinfo      Wed Dec 11 10:45:16 2019 +0000
+++ b/devel/meson/distinfo      Wed Dec 11 12:45:29 2019 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2019/10/18 09:59:46 nia Exp $
+$NetBSD: distinfo,v 1.3 2019/12/11 12:45:29 jperkin Exp $
 
 SHA1 (meson-0.52.0.tar.gz) = 7907a9492a980026104a87b3447aa9e3ff8bc254
 RMD160 (meson-0.52.0.tar.gz) = 2d0871d543ad96ddb33cc3616054c4419d1ffade
 SHA512 (meson-0.52.0.tar.gz) = b32206c5499580a74bb5442d21263b5328cc3302c3226452fb3a2434fdcf55d5fc16fc841102b09a85abc19dbd00e836a571f917833ef3d726d84524f89b2e1c
 Size (meson-0.52.0.tar.gz) = 1507218 bytes
+SHA1 (patch-mesonbuild_dependencies_base.py) = ab956b031235d9ff1b4a044e2e5e7848561bd1d4
 SHA1 (patch-mesonbuild_dependencies_dev.py) = c25f72fe6e3f270f9831be1d7efbff3bf7a4651e
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 6ed6fdfd7454b517ad5d1ebd1c387ebd73437d4b
diff -r 235e84aedfaa -r 2da360895210 devel/meson/patches/patch-mesonbuild_dependencies_base.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/meson/patches/patch-mesonbuild_dependencies_base.py Wed Dec 11 12:45:29 2019 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-mesonbuild_dependencies_base.py,v 1.1 2019/12/11 12:45:29 jperkin Exp $
+
+Backport fix from https://github.com/mesonbuild/meson/pull/6328
+
+--- mesonbuild/dependencies/base.py.orig       2019-10-06 17:01:35.000000000 +0000
++++ mesonbuild/dependencies/base.py
+@@ -21,6 +21,7 @@ import re
+ import json
+ import shlex
+ import shutil
++import stat
+ import textwrap
+ import platform
+ import typing
+@@ -1840,10 +1841,11 @@ class ExternalProgram:
+ 
+     def _is_executable(self, path):
+         suffix = os.path.splitext(path)[-1].lower()[1:]
++        execmask = stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
+         if mesonlib.is_windows():
+             if suffix in self.windows_exts:
+                 return True
+-        elif os.access(path, os.X_OK):
++        elif os.stat(path).st_mode & execmask:
+             return not os.path.isdir(path)
+         return False
+ 



Home | Main Index | Thread Index | Old Index