diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-30 13:44:37 +0000 |
| commit | 16f676d6bbd4f930b0017ccb20cebe5a29e17545 (patch) | |
| tree | 0d554b4f16bdef502035b743457fc29ffcc5e7f7 /nixpkgs/pkgs/development/libraries/glibc | |
| parent | e7caacc4c122b7641bb66a4c2595289347a4996c (diff) | |
| parent | 3a8d7958a610cd3fec3a6f424480f91a1b259185 (diff) | |
| download | nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.gz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.bz2 nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.lz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.xz nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.tar.zst nixlib-16f676d6bbd4f930b0017ccb20cebe5a29e17545.zip | |
Merge commit '3a8d7958a610cd3fec3a6f424480f91a1b259185'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/glibc')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz | bin | 65492 -> 66850 bytes | |||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glibc/common.nix | 6 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz b/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz index 2fda4294130a..8ea998b5bea2 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz +++ b/nixpkgs/pkgs/development/libraries/glibc/2.32-master.patch.gz Binary files differdiff --git a/nixpkgs/pkgs/development/libraries/glibc/common.nix b/nixpkgs/pkgs/development/libraries/glibc/common.nix index 888548d79f03..93f8f7a8641d 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.32"; - patchSuffix = "-46"; + patchSuffix = "-48"; sha256 = "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn"; in @@ -61,7 +61,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.32/master && git describe - glibc-2.32-46-g1799ac8eab + glibc-2.32-48-g16949aeaa0 $ git show --minimal --reverse glibc-2.32.. | gzip -9n --rsyncable - > 2.32-master.patch.gz To compare the archive contents zdiff can be used. @@ -153,6 +153,8 @@ stdenv.mkDerivation ({ "--enable-add-ons" "--sysconfdir=/etc" "--enable-stackguard-randomization" + "--enable-static-pie" + "--enable-bind-now" (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include") (lib.enableFeature profilingLibraries "profile") ] ++ lib.optionals withLinuxHeaders [ |