Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson: pass library install paths to g-ir-scanner #31453

Merged
merged 1 commit into from Nov 29, 2017

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Nov 9, 2017

Motivation for this change

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 is part of GNOME 3.26 update (#29392) and it is required for GNOME Shell and Polari.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

cc @aszlig (author of --fallback-library-path option in the gobjectIntospection patch)
cc @mbe, @rasendubi (meson maintainers)

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.
@jtojnar jtojnar mentioned this pull request Nov 9, 2017
71 tasks
@jtojnar jtojnar requested a review from aszlig November 23, 2017 19:42
@jtojnar jtojnar added this to Ready in GNOME Nov 25, 2017
@jtojnar jtojnar moved this from Ready to Done in GNOME Nov 27, 2017
@vcunat vcunat merged commit 1dba3c0 into NixOS:master Nov 29, 2017
@jtojnar jtojnar deleted the meson-absolute-gir branch November 29, 2017 21:51
@jtojnar jtojnar added this to Done in Meson breakages May 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
GNOME
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants