[glib-openssl/wip/improvements: 2/7] post_install: pass in the gio module dir
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-openssl/wip/improvements: 2/7] post_install: pass in the gio module dir
- Date: Wed, 25 Oct 2017 14:07:36 +0000 (UTC)
commit 5f159f81967cdf963bf42c73ffef2ac1317f9f03
Author: Ignacio Casal Quinteiro <qignacio amazon com>
Date: Tue Oct 24 09:49:37 2017 +0200
post_install: pass in the gio module dir
This is to avoid having to run pkgconfig in a subprocess
meson.build | 2 +-
mesonscripts/post_install.py | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 45d5d60..eb90ea8 100644
--- a/meson.build
+++ b/meson.build
@@ -120,7 +120,7 @@ subdir('tls/openssl')
subdir('tls/tests')
subdir('po')
-meson.add_install_script(join_paths('mesonscripts', 'post_install.py'))
+meson.add_install_script(join_paths('mesonscripts', 'post_install.py'), giomoduledir)
run_target('release',
command: [join_paths('mesonscripts', 'release.sh'),
diff --git a/mesonscripts/post_install.py b/mesonscripts/post_install.py
index 97b1cc9..2f15241 100755
--- a/mesonscripts/post_install.py
+++ b/mesonscripts/post_install.py
@@ -2,12 +2,10 @@
import os
import subprocess
+import sys
# Packagers handle this
if 'DESTDIR' not in os.environ:
- # post install scripts can't pass these so we must check again
- ret = subprocess.check_output(('pkg-config', '--variable',
- 'giomoduledir', 'gio-2.0'))
- moduledir = ret.decode().strip()
+ moduledir = sys.argv[1]
print('Updating module cache in {}...'.format(moduledir))
subprocess.check_call(('gio-querymodules', moduledir))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]