From 7e3e591d430e6576292379a4f2d94d5fc0656c36 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 16 Nov 2022 15:51:35 +0000 Subject: [PATCH] =?UTF-8?q?build:=20Don=E2=80=99t=20define=20redundant=20b?= =?UTF-8?q?uilt-in=20variables=20in=20pkgconfig=20calls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is deprecated since Meson 0.62.0, since Meson does this automatically for us. This fixes a Meson configure warning. Signed-off-by: Philip Withnall --- gio/meson.build | 4 +--- glib/meson.build | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gio/meson.build b/gio/meson.build index 1f7c1092d..24d44989d 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -877,9 +877,7 @@ libgio_dep = declare_dependency(link_with : libgio, pkg.generate(libgio, requires : ['glib-2.0', 'gobject-2.0'], - variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), - 'schemasdir=' + join_paths('${datadir}', schemas_subdir), - 'bindir=' + join_paths('${prefix}', get_option('bindir')), + variables : ['schemasdir=' + join_paths('${datadir}', schemas_subdir), 'giomoduledir=' + pkgconfig_giomodulesdir, 'gio=' + join_paths('${bindir}', 'gio'), 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), diff --git a/glib/meson.build b/glib/meson.build index 4130b1ba6..fef346e2f 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -438,8 +438,7 @@ pkg.generate(libglib, libraries_private : [win32_ldflags], subdirs : ['glib-2.0'], extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, - variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), - 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), + variables : ['glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], version : glib_version,