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

epoxy: 1.3.1 -> 1.5.0, add mesa to libepoxy runpath as fallback #35369

Merged
merged 2 commits into from Mar 4, 2018

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Feb 23, 2018

  1. Missing runtime dependency: libepoxy dlopen()s libEGL / libGL but didn't have mesa in its runpath
    -> error unless lib is already open or in LD_LIBRARY_PATH

  2. change expoxy dependency from mesa (should be avoided) to mesa_noglu

Motivation for this change

libepoxy dlopen()s libs from mesa, so mesa should be in its runpath as a fallback.
This change has no effect if the lib is already open or found in LD_LIBRARY_PATH, which is the case in most applications (or else this bug would have surfaced earlier...).
But it will retrigger a number of rebuilds.

I ran across this bug when trying to run qemu built with opengl/virglrenderer support.

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.

Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Thanks! Looks fine. But please rebase and target staging for this PR as it's a mass rebuild.

- libepoxy dlopen()s libEGL / libGL but didn't have mesa in its runpath
  -> error unless lib is already open or in LD_LIBRARY_PATH
- change dependency from mesa (should be avoided) to mesa_nonglu
@xeji
Copy link
Contributor Author

xeji commented Feb 23, 2018

just out of curiousity: what triggered three review requests? is that intended behavior or did I do sth wrong?

Edit: some of these autogenerated labels look wrong too...

@Ericson2314 Ericson2314 removed their request for review February 24, 2018 02:17
@FRidh
Copy link
Member

FRidh commented Feb 24, 2018

@xeji that's just GitHub that has issues with the automatic review requests feature in conjunction with changes base. It happens a lot, unfortunately.

@FRidh
Copy link
Member

FRidh commented Feb 24, 2018

@GrahamcOfBorg eval

@xeji xeji changed the title epoxy: add mesa to libepoxy runpath as fallback epoxy: 1.3.1 -> 1.5.0, add mesa to libepoxy runpath as fallback Mar 1, 2018
@xeji
Copy link
Contributor Author

xeji commented Mar 1, 2018

just noticed v1.3.1 was over 2.5 years old. time to update...

@fpletz fpletz merged commit bb8e273 into NixOS:staging Mar 4, 2018
@xeji xeji deleted the epoxy-runpath branch March 4, 2018 10:33
@vbgl
Copy link
Contributor

vbgl commented Mar 18, 2018

This breaks epoxy on darwin:

patchelf: command not found

@xeji
Copy link
Contributor Author

xeji commented Mar 18, 2018

oops... will make a fix limiting the patchelf to linux.

@xeji xeji mentioned this pull request Mar 18, 2018
8 tasks
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