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

Making glibc not depend on glibc-ports for platforms not requiring glibc-ports.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23327
This commit is contained in:
Lluís Batlle i Rossell 2010-08-21 19:05:42 +00:00
parent b9080de4fd
commit 0709b7df6d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/libraries/glibc-2.12/common.nix
View File

@ -12,6 +12,16 @@ cross :
let let
# For GNU/Hurd, see below. # For GNU/Hurd, see below.
version = if hurdHeaders != null then "20100512" else "2.12.1"; version = if hurdHeaders != null then "20100512" else "2.12.1";
needsPortsNative = stdenv.isMips || stdenv.isArm;
needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
needsPorts = if cross == null then needsPortsNative else needsPortsCross;
srcPorts = fetchurl {
url = "mirror://gnu/glibc/glibc-ports-2.11.tar.bz2"; # FIXME: 2.12.1 unavailable.
sha256 = "12b53f5k4gcr8rr1kg2ycf2701rygqsyf9r8gz4j3l9flaqi5liq";
};
in in
assert (cross != null) -> (gccCross != null); assert (cross != null) -> (gccCross != null);
@ -128,11 +138,6 @@ stdenv.mkDerivation ({
sha256 = "01vlr473skl08xpcjz0b4lw23lsnskf5kx9s8nxwa4mwa9f137vm"; sha256 = "01vlr473skl08xpcjz0b4lw23lsnskf5kx9s8nxwa4mwa9f137vm";
}; };
srcPorts = fetchurl {
url = "mirror://gnu/glibc/glibc-ports-2.11.tar.bz2"; # FIXME: 2.12.1 unavailable.
sha256 = "12b53f5k4gcr8rr1kg2ycf2701rygqsyf9r8gz4j3l9flaqi5liq";
};
# `fetchurl' is a function and thus should not be passed to the # `fetchurl' is a function and thus should not be passed to the
# `derivation' primitive. # `derivation' primitive.
fetchurl = null; fetchurl = null;
@ -146,7 +151,7 @@ stdenv.mkDerivation ({
sed -i "$i" -e "s^/bin/pwd^$PWD_P^g" sed -i "$i" -e "s^/bin/pwd^$PWD_P^g"
done done
tar xvjf "$srcPorts" ${if needsPorts then "tar xvjf ${srcPorts}" else ""}
mkdir ../build mkdir ../build
cd ../build cd ../build