alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch

17 lines
1.1 KiB
Diff
Raw Normal View History

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.
2017-11-09 02:48:26 +00:00
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
meson: 0.51.2 → 0.52.1 https://mesonbuild.com/Release-notes-for-0-52-0.html https://github.com/mesonbuild/meson/compare/0.52.0...0.52.1
2019-10-07 16:58:30 +01:00
@@ -801,6 +801,13 @@ class GnomeModule(ExtensionModule):
scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_source_dir(), self.interpreter.subproject_dir, state.subproject)]
scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_build_dir(), self.interpreter.subproject_dir, state.subproject)]
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.
2017-11-09 02:48:26 +00:00
meson: 0.46.1 → 0.48.2
2018-09-02 18:28:49 +01:00
+ 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]
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.
2017-11-09 02:48:26 +00:00
+ 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]
+
meson: 0.46.1 → 0.48.2
2018-09-02 18:28:49 +01:00
scan_target = self._make_gir_target(state, girfile, scan_command, depends, kwargs)
typelib_output = '%s-%s.typelib' % (ns, nsversion)
Copy permalink