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

gobject-introspection: 1.60.0 -> 1.60.1 #59406

Merged
merged 1 commit into from Apr 27, 2019

Conversation

hedning
Copy link
Contributor

@hedning hedning commented Apr 13, 2019

Things done

Updated the shlib patches:

  • Upstream now forces basename in sanitize_shlib_path(lib) if the system isn't
    darwin. We patch the function to always prefer absolute paths
  • Due to the above we no longer need the macos patch
  • sanitize_shlib_path is applied after resolve_from_ldd_output so we need to
    apply fallback_libpath afterwards too (else we get stuff like
    /nix/store/...@rpath/foo.dylib on darwin)
  • Note that the fallback_path no longer have any unit tests. To fix this it might be better making sanitize_shlib_path take fallback_path as an argument and return a sanitizer which applies it, though not sure if it's a big deal.

https://gitlab.gnome.org/GNOME/gobject-introspection/blob/1.60.1/NEWS

  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Updated the shlib patches:

- Upstream now forces basename in sanitize_shlib_path(lib) if the system isn't
  darwin. We patch the function to always prefer absolute paths
- Due to the above we no longer need the macos patch
- `sanitize_shlib_path` is applied after `resolve_from_ldd_output` so we need to
  apply `fallback_libpath` afterwards too (else we get stuff like
  `/nix/store/...@rpath/foo.dylib` on darwin)
- Note that the `fallback_path` no longer have any unit tests

https://gitlab.gnome.org/GNOME/gobject-introspection/blob/1.60.1/NEWS
@7c6f434c
Copy link
Member

@GrahamcOfBorg build gobject-introspection

@7c6f434c
Copy link
Member

Maybe macOS now has the dependencies in cache?

@hedning
Copy link
Contributor Author

hedning commented Apr 23, 2019

IIRC the builds finished successfully when targeting master.



-def resolve_from_ldd_output(libraries, output, basename=False):
+def resolve_from_ldd_output(libraries, output, basename=False, fallback_libpath=""):
def sanitize_shlib_path(lib):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it might be better to pass fallback_libpath here and let the function return the sanitizer function, that way we could unit test the fallback libpath, though probably not a big deal. Any thoughts @jtojnar

@hedning
Copy link
Contributor Author

hedning commented Apr 25, 2019

I did a rebuild of my system using this and the glib update, haven't seen any issues. Pretty confident this is good to go.

@FRidh FRidh merged commit d747f16 into NixOS:staging Apr 27, 2019
@hedning hedning deleted the gobject-introspection-1.60.1 branch October 15, 2019 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants