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

openssl: don't autodetect platform on armv6/7l #47953

Merged
merged 1 commit into from Oct 28, 2018

Conversation

lopsided98
Copy link
Contributor

Motivation for this change

OpenSSL currently generates invalid armv6l instructions when compiled on an armv7l machine because it uses its own system for detecting the architecture, so the autotools build_alias trick does not work. This type of build seems to be a little controversial and unsupported in nixpkgs, but I think this PR is harmless and makes the build more pure.

Things done

This PR explicitly specifies the architecture on armv6l and armv7l, causing the correct instructions to be generated even when building for armv6l on armv7l. This change does not affect other architectures.

  • 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)
  • Fits CONTRIBUTING.md.

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

3 participants