JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glibc: security 2.24 -> 2.25

Browse Source 
https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html

Stripping was failing on libm.a; I don't know why.
This commit is contained in:
Vladimír Čunát 2017-02-11 22:14:49 +01:00
parent 2ce45fbf0d
commit a01f8a4c38
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/glibc/common.nix
View File

@ -10,8 +10,8 @@ cross:
, preConfigure ? "", ... }@args: , preConfigure ? "", ... }@args:
let let
version = "2.24"; version = "2.25";
sha256 = "1ghzp41ryvsqxn4rhrm8r25wc33m2jf8zrcc1pj3jxyk8ad9a0by"; sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";
in in
assert cross != null -> gccCross != null; assert cross != null -> gccCross != null;
@ -138,7 +138,7 @@ stdenv.mkDerivation ({
lib.optionalString (cross != null) "-${cross.config}"; lib.optionalString (cross != null) "-${cross.config}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
inherit sha256; inherit sha256;
}; };

3
pkgs/development/libraries/glibc/default.nix
View File

@ -52,6 +52,7 @@ in
# the .so It used to be a symlink, but now it is a script # the .so It used to be a symlink, but now it is a script
cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so
fi fi
set -x
''; '';
postInstall = '' postInstall = ''
@ -81,7 +82,7 @@ in
# to bootstrap-tools; on cross-arm this stripping would break objects. # to bootstrap-tools; on cross-arm this stripping would break objects.
if [ -z "$crossConfig" ]; then if [ -z "$crossConfig" ]; then
for i in "$out"/lib/*.a; do for i in "$out"/lib/*.a; do
strip -S "$i" [ "$i" = "$out/lib/libm.a" ] || strip -S "$i"
done done
fi fi