[gtk/wip/Jehan/gio-querymodules-pkg-config: 27/27] build-aux: fallback to default glib-compile-schemas & gio-querymodules.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/Jehan/gio-querymodules-pkg-config: 27/27] build-aux: fallback to default glib-compile-schemas & gio-querymodules.
- Date: Sun, 28 Jun 2020 10:45:38 +0000 (UTC)
commit 8df0c818078f480870befb7935b3d7eeae88512b
Author: Jehan <jehan girinstud io>
Date: Sun Jun 28 12:39:28 2020 +0200
build-aux: fallback to default glib-compile-schemas & gio-querymodules.
The pkg-config variables have been added in GLib 2.62.0. Let's fallback
to default names for these tools in such case (`pkg-config` still
returns a 0 return value, but with empty output for absent variables).
build-aux/meson/post-install.py | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/build-aux/meson/post-install.py b/build-aux/meson/post-install.py
index bdbc8a32c9..e302a6ee5a 100644
--- a/build-aux/meson/post-install.py
+++ b/build-aux/meson/post-install.py
@@ -30,6 +30,9 @@ if 'DESTDIR' not in os.environ:
glib_compile_schemas = subprocess.check_output(['pkg-config',
'--variable=glib_compile_schemas',
'gio-2.0']).strip()
+ if not os.path.exists(glib_compile_schemas):
+ # pkg-config variables only available since GLib 2.62.0.
+ glib_compile_schemas = 'glib-compile-schemas'
subprocess.call([glib_compile_schemas,
os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
@@ -49,4 +52,7 @@ if 'DESTDIR' not in os.environ:
gio_querymodules = subprocess.check_output(['pkg-config',
'--variable=gio_querymodules',
'gio-2.0']).strip()
+ if not os.path.exists(gio_querymodules):
+ # pkg-config variables only available since GLib 2.62.0.
+ gio_querymodules = 'gio-querymodules'
subprocess.call([gio_querymodules, gtk_printmodule_dir])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]