mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-10-01 09:30:20 +02:00
17 lines
950 B
Diff
17 lines
950 B
Diff
--- a/mesonbuild/modules/gnome.py
|
|
+++ b/mesonbuild/modules/gnome.py
|
|
@@ -805,6 +805,13 @@
|
|
scan_command += self._scan_langs(state, [lc[0] for lc in langs_compilers])
|
|
scan_command += list(external_ldflags)
|
|
|
|
+ if len(set([girtarget.get_custom_install_dir()[0] for girtarget in girtargets])) > 1:
|
|
+ raise MesonException('generate_gir tries to build multiple libraries with different install_dir at once: {}'.format(','.join([str(girtarget) for girtarget in girtargets])))
|
|
+
|
|
+ fallback_libpath = girtargets[0].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]
|
|
+
|
|
scan_target = self._make_gir_target(state, girfile, scan_command, depends, kwargs)
|
|
|
|
typelib_output = '%s-%s.typelib' % (ns, nsversion)
|