CVS commit: pkgsrc/devel/py-meson

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Mon Jul 15 15:11:44 UTC 2019

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

Log Message:
Apply patches from /usr/pkg/lib/python3.7/site-packages/mesonbuild/envconfig.py
to fix e.g.

  File "/usr/pkg/lib/python3.7/site-packages/mesonbuild/dependencies/base.py", line 1966, in from_entry
    return ExternalProgram(name, command=command, silent=True)
  File "/usr/pkg/lib/python3.7/site-packages/mesonbuild/dependencies/base.py", line 1929, in __init__
    self.path = self.command[-1]
IndexError: list index out of range
*** Error code 2

Stop.
make[1]: stopped in /usr/pkgsrc/devel/at-spi2-atk
*** Error code 1


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/devel/py-meson/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/py-meson/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-meson/patches/patch-mesonbuild_envconfig.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.25 pkgsrc/devel/py-meson/Makefile:1.26
--- pkgsrc/devel/py-meson/Makefile:1.25 Fri Jul 12 19:03:40 2019
+++ pkgsrc/devel/py-meson/Makefile      Mon Jul 15 15:11:43 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2019/07/12 19:03:40 adam Exp $
+# $NetBSD: Makefile,v 1.26 2019/07/15 15:11:43 prlw1 Exp $
 
 DISTNAME=      meson-0.51.1
+PKGREVISION=   1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}

Index: pkgsrc/devel/py-meson/distinfo
diff -u pkgsrc/devel/py-meson/distinfo:1.22 pkgsrc/devel/py-meson/distinfo:1.23
--- pkgsrc/devel/py-meson/distinfo:1.22 Fri Jul 12 19:03:40 2019
+++ pkgsrc/devel/py-meson/distinfo      Mon Jul 15 15:11:43 2019
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.22 2019/07/12 19:03:40 adam Exp $
+$NetBSD: distinfo,v 1.23 2019/07/15 15:11:43 prlw1 Exp $
 
 SHA1 (meson-0.51.1.tar.gz) = 157c6924fdade6827a6cb7cdf9ab978e0ae249fa
 RMD160 (meson-0.51.1.tar.gz) = 3a07dff3ee59890cdbb05773e5ebcd776ee775db
 SHA512 (meson-0.51.1.tar.gz) = 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
 Size (meson-0.51.1.tar.gz) = 1451234 bytes
 SHA1 (patch-mesonbuild_compilers_compilers.py) = 08404a441ec8ba37c780af4fba44492021f858dd
+SHA1 (patch-mesonbuild_envconfig.py) = 82199f5ed59d368b76c932112da7d42e2f32001a
 SHA1 (patch-mesonbuild_environment.py) = 7df96002a8b625cfa08b88cfa4f0cf4d5b76cf64
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 6ed6fdfd7454b517ad5d1ebd1c387ebd73437d4b

Added files:

Index: pkgsrc/devel/py-meson/patches/patch-mesonbuild_envconfig.py
diff -u /dev/null pkgsrc/devel/py-meson/patches/patch-mesonbuild_envconfig.py:1.1
--- /dev/null   Mon Jul 15 15:11:44 2019
+++ pkgsrc/devel/py-meson/patches/patch-mesonbuild_envconfig.py Mon Jul 15 15:11:44 2019
@@ -0,0 +1,18 @@
+$NetBSD: patch-mesonbuild_envconfig.py,v 1.1 2019/07/15 15:11:44 prlw1 Exp $
+
+https://github.com/mesonbuild/meson/issues/5451
+
+--- mesonbuild/envconfig.py.orig       2019-07-09 16:34:42.000000000 +0000
++++ mesonbuild/envconfig.py
+@@ -340,6 +340,11 @@ This is probably wrong, it should always
+             command = os.environ.get(evar)
+             if command is not None:
+                 command = shlex.split(command)
++
++        # Do not return empty or blank string entries
++        if command is not None and (len(command) == 0 or len(command[0].strip()) == 0):
++            return None
++
+         return command
+ 
+ class Directories: