meson: pass library install paths to g-ir-scanner
We are patching g-ir-scanner to produce absolute paths in the GIR files. When an application uses an internal library placed in a non-standard path (e.g. $out/lib/gnome-shell), the scanner needs to be informed. For autotools-based apps, the full path was obtained from libtool-wrapped files; with Meson, this is no longer possible – we need to pass the path information in some other way. This commit channels the --fallback-library-path option added to g-ir-scanner in aforementioned patch.
This commit is contained in:
@@ -0,0 +1,13 @@
|
||||
--- a/mesonbuild/modules/gnome.py
|
||||
+++ b/mesonbuild/modules/gnome.py
|
||||
@@ -427,6 +427,10 @@
|
||||
scan_command += ['--no-libtool', '--namespace=' + ns, '--nsversion=' + nsversion, '--warn-all',
|
||||
'--output', '@OUTPUT@']
|
||||
|
||||
+ fallback_libpath = girtarget.get_custom_install_dir()[0]
|
||||
+ if fallback_libpath is not None and isinstance(fallback_libpath, str) and len(fallback_libpath) > 0 and fallback_libpath[0] == "/":
|
||||
+ scan_command += ['--fallback-library-path=' + fallback_libpath]
|
||||
+
|
||||
header = kwargs.pop('header', None)
|
||||
if header:
|
||||
if not isinstance(header, str):
|
||||
Reference in New Issue
Block a user