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

pkgsCross.musl32: fix a few basic package #112939

Merged
merged 8 commits into from
Feb 18, 2021

Conversation

symphorien
Copy link
Member

A rebase of #89471 on current staging, fixing some patches.

Fixes #88554 for gcc6 7 8.

cc @wfranzini @matthewbauer @nagisa @NixOS/exotic-platform-maintainers

Tested by building

nix-build . -A pkgsCross.musl32.libsodium -A pkgsCross.musl32.libgcrypt -A pkgsCross.musl32.openssl -A pkgsCross.musl32.audit -A pkgsCross.musl64.openssl -A pkgsCross.musl32.gcc7 -A gcc7
Motivation for this change

I occasionally use pkgsCross.musl32.

Note: I don't fully understand the stackprotector patches, I only rebased them without much thought.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

wfranzini and others added 8 commits February 12, 2021 11:06
The makefile patch pulled from alpinelinux used to enable
stackprotector unconditionally.  This change use the nixpkgs flag
hardeningEnable.

This is required to support platform where stackprotector has
problems.
Disable the pipe rewind related feature since musl has no support for it.
In order to support stackprotector on musl32, this change import a
couple of patches from alpinelinux:
1. libssp_nonshared.a is built alongside musl's libc
2. the above library is automatically linked when compiling with gcc6
   or gcc7
@symphorien symphorien merged commit 009d457 into NixOS:staging Feb 18, 2021
@Mic92
Copy link
Member

Mic92 commented Mar 7, 2021

The patch no longer applies after #113962

@Mic92
Copy link
Member

Mic92 commented Mar 7, 2021

@Mic92
Copy link
Member

Mic92 commented Mar 7, 2021

#115327

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.

4 participants