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.

Sign up for GitHub

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

Jump to bottom

cc-wrapper: Fix support for qtbase-setup-hook #28065

Merged
merged 1 commit into from Aug 9, 2017
Merged

cc-wrapper: Fix support for qtbase-setup-hook #28065

merged 1 commit into from Aug 9, 2017

Conversation

orivej
Copy link
Contributor

@orivej orivej commented Aug 9, 2017

Revert #27657 (comment) due to #28021 (comment).

I have confirmed that this fixes build of qjackctl.

@orivej orivej changed the base branch from master to staging August 9, 2017 09:19
@avnik
Copy link
Contributor

avnik commented Aug 9, 2017

Should it be PR to staging, not master?

@globin
Copy link
Member

globin commented Aug 9, 2017 •
edited

Testing (https://hydra.mayflower.de/eval/844)

@globin globin self-assigned this Aug 9, 2017
@orivej
Copy link
Contributor Author

orivej commented Aug 9, 2017

I wonder if we should just add all discovered directories to rpath, without looking at their files. Since this code deals with .so files, it affects only Linux, but on Linux patchelf --shrink-rpath will strip unneeded directories anyway.

@globin
Copy link
Member

globin commented Aug 9, 2017

@orivej this seems to fix the issue, are you happy with this, then I'll merge?

Ericson2314
Ericson2314 approved these changes Aug 9, 2017
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

Looks good to me, but I wouldn't mind doing the simple thing and just "add[ing] all discovered directories to rpath" either. I guess its a tension between simplicity and backwards compat?

@globin globin merged commit 771f28b into NixOS:staging Aug 9, 2017
@orivej
Copy link
Contributor Author

orivej commented Aug 9, 2017

@globin Thanks for merging! This allows us to take upon remaining issues without delaying buildable staging:

  1. let patchelf --shrink-rpath do this work of ld-wrapper
  2. fix qtbase-setup-hook to support nix-shell '<nixpkgs>' -A qt5.qttools
  3. ignore the argument to the linker after -o (ld-wrapper: Optimize expanding rpath #27657 (review))

@orivej orivej deleted the cc-wrapper branch August 26, 2017 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Ericson2314 approved these changes

Assignees

@globin globin

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@orivej @avnik @globin @Ericson2314