diff --git a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch index 8e15d3210c..8b95dc7592 100644 --- a/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch +++ b/package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch @@ -1,4 +1,4 @@ -From 3d6a2db2270346236dd6247e0648ea0c949ba468 Mon Sep 17 00:00:00 2001 +From 59934e2116e025ecfe23baf6febc4a0eb85f60cd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 15 Feb 2020 15:13:59 +0100 Subject: [PATCH] mesonbuild/dependencies/base.py: add pkg_config_static @@ -20,24 +20,26 @@ Signed-off-by: Fabrice Fontaine Signed-off-by: Romain Naour [Rebased on 0.57.1] Signed-off-by: Peter Seiderer +[rebased on 1.3.0] +Signed-off-by: Antoine Coutant --- - mesonbuild/dependencies/pkgconfig.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + mesonbuild/dependencies/pkgconfig.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py -index 1e8d9132e..d902ba215 100644 +index e86206b88..94888657d 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py -@@ -338,7 +338,8 @@ class PkgConfigDependency(ExternalDependency): - env = None - libcmd = ['--libs'] - -- if self.static: -+ if self.static or \ +@@ -169,7 +169,8 @@ class PkgConfigCLI(PkgConfigInterface): + env['PKG_CONFIG_ALLOW_SYSTEM_LIBS'] = '1' + args: T.List[str] = [] + args += self._define_variable_args(define_variable) +- if static: ++ if static or \ + (self.env.properties[self.for_machine].get('pkg_config_static', None) == 'true'): - libcmd.append('--static') - - libcmd.append(self.name) --- + args.append('--static') + args += ['--libs', name] + ret, out, err = self._call_pkgbin(args, env=env) +-- 2.25.1 diff --git a/package/meson/meson.hash b/package/meson/meson.hash index cb36b674fa..150fd6d1bb 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc -sha256 d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c meson-1.1.1.tar.gz +# https://github.com/mesonbuild/meson/releases/download/1.3.1/meson-1.3.1.tar.gz.asc +sha256 6020568bdede1643d4fb41e28215be38eff5d52da28ac7d125457c59e0032ad7 meson-1.3.1.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 503aca8c25..467569d28b 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 1.1.1 +MESON_VERSION = 1.3.1 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING diff --git a/support/misc/cross-compilation.conf.in b/support/misc/cross-compilation.conf.in index 7053df472b..a58ab553d0 100644 --- a/support/misc/cross-compilation.conf.in +++ b/support/misc/cross-compilation.conf.in @@ -10,7 +10,7 @@ ar = '@TARGET_AR@' strip = '@TARGET_STRIP@' cmake = '@BR2_CMAKE@' fortran = '@TARGET_FC@' -pkgconfig = '@PKGCONF_HOST_BINARY@' +pkg-config = '@PKGCONF_HOST_BINARY@' g-ir-compiler = '@STAGING_DIR@/usr/bin/g-ir-compiler' g-ir-scanner = '@STAGING_DIR@/usr/bin/g-ir-scanner'