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

pypy, pypy3: Remove wrapper #54013

Merged
merged 1 commit into from Jan 16, 2019
Merged

pypy, pypy3: Remove wrapper #54013

merged 1 commit into from Jan 16, 2019

Conversation

andersk
Copy link
Contributor

@andersk andersk commented Jan 15, 2019

Motivation for this change

The wrapper is not needed because the runpath is already set correctly, and LD_LIBRARY_PATH was breaking child processes linked against different libc versions.

(Previously discussed in #52635.)

Things done
  • 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 nox --run "nox-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.

@andersk
pypy, pypy3: Remove wrapper
0256587 
The wrapper is not needed because the runpath is already set correctly,
and LD_LIBRARY_PATH was breaking child processes linked against
different libc versions.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
@andersk andersk requested a review from FRidh as a code owner January 15, 2019 22:54
@andersk andersk mentioned this pull request Jan 15, 2019
Closed
10 tasks
@FRidh
Copy link
Member

FRidh commented Jan 16, 2019

Tested both pypy and pypy3 ?

@andersk
Copy link
Contributor Author

andersk commented Jan 16, 2019

@FRidh Yeah, tested pypy and pypy3 with import sqlite3, verified with strace that it successfully opened libsqlite3.so.0.

@FRidh FRidh merged commit 004b908 into NixOS:master Jan 16, 2019
@andersk andersk deleted the unwrap-pypy branch December 10, 2019 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh Awaiting requested review from FRidh

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@andersk @FRidh @GrahamcOfBorg