Now glibc-NPTL builds...

svn path=/nixpkgs/trunk/; revision=9162
This commit is contained in:
Michael Raskin 2007-08-18 19:04:19 +00:00
parent a9f676e098
commit cfab5a8cf9
2 changed files with 12 additions and 7 deletions

View file

@ -1,16 +1,18 @@
{ stdenv, fetchurl, kernelHeaders
{ stdenv, fetchurl, kernelHeaders
,perl
, installLocales ? true
, profilingLibraries ? false
}:
stdenv.mkDerivation {
name = "glibc-2.5-nptl";
name = "glibc-2.6.1-nptl";
builder = ./builder.sh;
src = fetchurl {
url = http://ftp.gnu.org/gnu/glibc/glibc-2.5.tar.bz2;
md5 = "1fb29764a6a650a4d5b409dda227ac9f";
};
src =
fetchurl {
url = http://ftp.gnu.org/gnu/glibc/glibc-2.6.1.tar.bz2;
sha256 = "08pcfsi9zpikjakljklks2ln3hn7544cr9br4kbh5kx27cy3mv9x";
};
patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ];
@ -18,6 +20,8 @@ stdenv.mkDerivation {
inherit (stdenv) is64bit;
buildInputs=[perl];
# `--with-tls --without-__thread' enables support for TLS but causes
# it not to be used. Required if we don't want to barf on 2.4
# kernels. Or something.

View file

@ -1421,7 +1421,8 @@ rec {
});
glibcNPTL = import ../development/libraries/glibc-nptl {
inherit stdenv fetchurl kernelHeaders;
inherit fetchurl kernelHeaders perl;
stdenv = overrideGCC stdenv gcc34;
};
glibmm = import ../development/libraries/gtk-libs-2.6/glibmm {