diff options
| author | cirnatdan <cirnatdan@pkgsrc.org> | 2021-06-01 05:55:46 +0000 |
|---|---|---|
| committer | cirnatdan <cirnatdan@pkgsrc.org> | 2021-06-01 05:55:46 +0000 |
| commit | ccc56eed1f157e13104ad1afdc3221385968029e (patch) | |
| tree | ea379b21e378576aa2fca7c12751db70e7d6395a | |
| parent | 54861923129a53823c1e2b0898c88e330ae10a6b (diff) | |
| download | pkgsrc-ccc56eed1f157e13104ad1afdc3221385968029e.tar.gz | |
meson: interpreter: flatten environment() initial values
Import upstream patch for flattening lists. Fixes build of nautilus
https://github.com/mesonbuild/meson/pull/8761/files
| -rw-r--r-- | devel/meson/Makefile | 3 | ||||
| -rw-r--r-- | devel/meson/distinfo | 3 | ||||
| -rw-r--r-- | devel/meson/patches/patch-mesonbuild_interpreter_interpreterobjects.py | 19 |
3 files changed, 23 insertions, 2 deletions
diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 9834617edc6..a91a706e79f 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2021/05/04 18:54:29 adam Exp $ +# $NetBSD: Makefile,v 1.26 2021/06/01 05:55:46 cirnatdan Exp $ DISTNAME= meson-0.58.0 +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/} diff --git a/devel/meson/distinfo b/devel/meson/distinfo index c2a7daed45d..7af3cf0dcc3 100644 --- a/devel/meson/distinfo +++ b/devel/meson/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2021/05/04 18:54:29 adam Exp $ +$NetBSD: distinfo,v 1.23 2021/06/01 05:55:46 cirnatdan Exp $ SHA1 (meson-0.58.0.tar.gz) = 42e7e911460a925896619a13db67bab948b968fd RMD160 (meson-0.58.0.tar.gz) = 6457ae48866e33d0c710856fc7eb332ba538ee08 @@ -7,5 +7,6 @@ Size (meson-0.58.0.tar.gz) = 1887373 bytes SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = cc9fe3204c7cf003d288ef5635fa7853a44a2e34 SHA1 (patch-mesonbuild_dependencies_dev.py) = ce9b93369d771f7e24208923b58af769e51bcd98 SHA1 (patch-mesonbuild_environment.py) = d0340ea4149c7ed89fd64d0f1631721f7b9f04aa +SHA1 (patch-mesonbuild_interpreter_interpreterobjects.py) = c03b4f2f8011462c250a3dbb4c5e658684624431 SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 7b524383bfa6511c43d2d27de91442d42623c3ad SHA1 (patch-mesonbuild_scripts_depfixer.py) = b8673de86f49f7a9876afcd05536766e0555d217 diff --git a/devel/meson/patches/patch-mesonbuild_interpreter_interpreterobjects.py b/devel/meson/patches/patch-mesonbuild_interpreter_interpreterobjects.py new file mode 100644 index 00000000000..bf714edc2cd --- /dev/null +++ b/devel/meson/patches/patch-mesonbuild_interpreter_interpreterobjects.py @@ -0,0 +1,19 @@ +$NetBSD: patch-mesonbuild_interpreter_interpreterobjects.py,v 1.1 2021/06/01 05:55:46 cirnatdan Exp $ + +Upstream patch, won't be necessary when the next version is released +interpreter: flatten environment() initial values +https://github.com/mesonbuild/meson/pull/8761 + +--- mesonbuild/interpreter/interpreterobjects.py.orig 2021-04-27 06:49:45.000000000 +0000 ++++ mesonbuild/interpreter/interpreterobjects.py +@@ -165,7 +165,9 @@ class EnvironmentVariablesHolder(Mutable + for k, v in initial_values.items(): + self.set_method([k, v], {}) + elif initial_values is not None: +- for e in mesonlib.stringlistify(initial_values): ++ for e in mesonlib.listify(initial_values): ++ if not isinstance(e, str): ++ raise InterpreterException('Env var definition must be a list of strings.') + if '=' not in e: + raise InterpreterException('Env var definition must be of type key=val.') + (k, val) = e.split('=', 1) |