luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

build: Don’t define redundant built-in variables in pkgconfig calls

Browse Source 
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 <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-11-16 15:51:35 +00:00
parent 91f14cd058
commit 7e3e591d43
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/meson.build
View File

@ -877,9 +877,7 @@ libgio_dep = declare_dependency(link_with : libgio,
pkg.generate(libgio, pkg.generate(libgio,
requires : ['glib-2.0', 'gobject-2.0'], requires : ['glib-2.0', 'gobject-2.0'],
variables : ['datadir=' + join_paths('${prefix}', get_option('datadir')), variables : ['schemasdir=' + join_paths('${datadir}', schemas_subdir),
'schemasdir=' + join_paths('${datadir}', schemas_subdir),
'bindir=' + join_paths('${prefix}', get_option('bindir')),
'giomoduledir=' + pkgconfig_giomodulesdir, 'giomoduledir=' + pkgconfig_giomodulesdir,
'gio=' + join_paths('${bindir}', 'gio'), 'gio=' + join_paths('${bindir}', 'gio'),
'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'), 'gio_querymodules=@0@'.format(pkgconfig_multiarch_bindir / 'gio-querymodules'),

3
glib/meson.build
View File

@ -438,8 +438,7 @@ pkg.generate(libglib,
libraries_private : [win32_ldflags], libraries_private : [win32_ldflags],
subdirs : ['glib-2.0'], subdirs : ['glib-2.0'],
extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags,
variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), variables : ['glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'),
'gobject_query=' + join_paths('${bindir}', 'gobject-query'), 'gobject_query=' + join_paths('${bindir}', 'gobject-query'),
'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')],
version : glib_version, version : glib_version,