diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-02 13:19:07 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-02 13:19:07 +0000 |
| commit | 5bdea119d401a7d89ca86f4d7dd8b5bb52fc8b67 (patch) | |
| tree | 9bb0e2b095a5d51e27f6191f9eb8cca758ee7c4e /pkgs/development/libraries/glibc | |
| parent | be901fa8befb762928e2c2f7805ce98c76dc2c53 (diff) | |
| parent | e0bd67afd7ea489a130688d20dbd7efe597770b6 (diff) | |
| download | nixlib-5bdea119d401a7d89ca86f4d7dd8b5bb52fc8b67.tar nixlib-5bdea119d401a7d89ca86f4d7dd8b5bb52fc8b67.tar.gz nixlib-5bdea119d401a7d89ca86f4d7dd8b5bb52fc8b67.tar.bz2 nixlib-5bdea119d401a7d89ca86f4d7dd8b5bb52fc8b67.tar.lz nixlib-5bdea119d401a7d89ca86f4d7dd8b5bb52fc8b67.tar.xz nixlib-5bdea119d401a7d89ca86f4d7dd8b5bb52fc8b67.tar.zst nixlib-5bdea119d401a7d89ca86f4d7dd8b5bb52fc8b67.zip | |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
Diffstat (limited to 'pkgs/development/libraries/glibc')
6 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/libraries/glibc/2.13/common.nix b/pkgs/development/libraries/glibc/2.13/common.nix index 7d17f21a9142..86004de640a3 100644 --- a/pkgs/development/libraries/glibc/2.13/common.nix +++ b/pkgs/development/libraries/glibc/2.13/common.nix @@ -16,7 +16,8 @@ let needsPortsNative = stdenv.isMips || stdenv.isArm; needsPortsCross = cross.arch == "mips" || cross.arch == "arm"; - needsPorts = if (stdenv ? cross) && stdenv.cross != null then true + needsPorts = + if (stdenv ? cross) && stdenv.cross != null && hurdHeaders == null then true else if cross == null then needsPortsNative else needsPortsCross; @@ -108,7 +109,7 @@ stdenv.mkDerivation ({ (if cross.float == "soft" then "--without-fp" else "--with-fp") "--enable-kernel=2.6.0" "--with-__thread" - ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [ + ] ++ stdenv.lib.optionals stdenv.isArm [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" @@ -184,7 +185,8 @@ stdenv.mkDerivation ({ meta = { homepage = http://www.gnu.org/software/libc/; - description = "The GNU C Library"; + description = "The GNU C Library" + + stdenv.lib.optionalString (hurdHeaders != null) ", for GNU/Hurd"; longDescription = '' Any Unix-like operating system needs a C library: the library which diff --git a/pkgs/development/libraries/glibc/2.13/default.nix b/pkgs/development/libraries/glibc/2.13/default.nix index 1b4e43b1013a..f80ed9372e63 100644 --- a/pkgs/development/libraries/glibc/2.13/default.nix +++ b/pkgs/development/libraries/glibc/2.13/default.nix @@ -14,7 +14,9 @@ let cross = if gccCross != null then gccCross.target else null; in build cross ({ - name = "glibc${if debugSymbols then "-debug" else ""}"; + name = "glibc" + + stdenv.lib.optionalString (hurdHeaders != null) "-hurd" + + stdenv.lib.optionalString debugSymbols "-debug"; inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries gccCross; diff --git a/pkgs/development/libraries/glibc/2.14/common.nix b/pkgs/development/libraries/glibc/2.14/common.nix index fcc07b71cf9e..a8d0f661b72f 100644 --- a/pkgs/development/libraries/glibc/2.14/common.nix +++ b/pkgs/development/libraries/glibc/2.14/common.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation ({ (if cross.float == "soft" then "--without-fp" else "--with-fp") "--enable-kernel=2.6.0" "--with-__thread" - ] ++ stdenv.lib.optionals (stdenv.system == "armv5tel-linux") [ + ] ++ stdenv.lib.optionals stdenv.isArm [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" diff --git a/pkgs/development/libraries/glibc/2.9/default.nix b/pkgs/development/libraries/glibc/2.9/default.nix index b778743147e6..7d42825206e2 100644 --- a/pkgs/development/libraries/glibc/2.9/default.nix +++ b/pkgs/development/libraries/glibc/2.9/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { "--enable-kernel=2.6.0" "--without-fp" "--with-__thread" - ] ++ (if (stdenv.system == "armv5tel-linux") then [ + ] ++ (if stdenv.isArm then [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" diff --git a/pkgs/development/libraries/glibc/2.9/headers.nix b/pkgs/development/libraries/glibc/2.9/headers.nix index adb9a22f4810..7adeb11c8bc1 100644 --- a/pkgs/development/libraries/glibc/2.9/headers.nix +++ b/pkgs/development/libraries/glibc/2.9/headers.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--disable-sanity-checks" "--enable-hacker-mode" (if profilingLibraries then "--enable-profile" else "--disable-profile") - ] ++ (if (stdenv.system == "armv5tel-linux") then [ + ] ++ (if stdenv.isArm then [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" diff --git a/pkgs/development/libraries/glibc/2.9/locales.nix b/pkgs/development/libraries/glibc/2.9/locales.nix index c7b1bb2bff0a..a1fe9f82f143 100644 --- a/pkgs/development/libraries/glibc/2.9/locales.nix +++ b/pkgs/development/libraries/glibc/2.9/locales.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--enable-add-ons" "--without-headers" "--disable-profile" - ] ++ (if (stdenv.system == "armv5tel-linux") then [ + ] ++ (if stdenv.isArm then [ "--host=arm-linux-gnueabi" "--build=arm-linux-gnueabi" "--without-fp" |