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

* Use Glibc 2.8.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=12988
This commit is contained in:
Eelco Dolstra 2008-10-07 16:55:20 +00:00
parent 19ebc883e1
commit 648b6f6631
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/libraries/glibc-2.8/default.nix
View File

@ -3,14 +3,14 @@
, profilingLibraries ? false , profilingLibraries ? false
}: }:
stdenv.mkDerivation rec stdenv.mkDerivation rec {
{ name = "glibc-2.8-20081006";
name = "glibc-2.8-20080707";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl
{ src = fetchurl {
url = "ftp://sources.redhat.com/pub/glibc/snapshots/${name}.tar.bz2"; url = "ftp://sources.redhat.com/pub/glibc/snapshots/${name}.tar.bz2";
sha256 = "e317b854807f52cd539ed9b6bf8b1c2977e650e27e90baa787444bd3b74f5e72"; sha256 = "e32021c14f0bda55b6a5d2a98ac878a03b2c6f78a1ab4a11f0386a51eda1d58e";
}; };
inherit kernelHeaders installLocales; inherit kernelHeaders installLocales;
@ -45,9 +45,11 @@ stdenv.mkDerivation rec
# `--with-tls --without-__thread' enables support for TLS but causes # `--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 # it not to be used. Required if we don't want to barf on 2.4
# kernels. Or something. # kernels. Or something.
configureFlags="--enable-add-ons configureFlags = ''
--enable-add-ons
--with-headers=${kernelHeaders}/include --with-headers=${kernelHeaders}/include
${if profilingLibraries then "--enable-profile" else "--disable-profile"}"; ${if profilingLibraries then "--enable-profile" else "--disable-profile"}
'';
# Workaround for this bug: # Workaround for this bug:
# http://sourceware.org/bugzilla/show_bug.cgi?id=411 # http://sourceware.org/bugzilla/show_bug.cgi?id=411
@ -55,4 +57,9 @@ stdenv.mkDerivation rec
# preprocessor symbol `__i686' will be defined to `1'. This causes # preprocessor symbol `__i686' will be defined to `1'. This causes
# the symbol __i686.get_pc_thunk.dx to be mangled. # the symbol __i686.get_pc_thunk.dx to be mangled.
NIX_CFLAGS_COMPILE = "-U__i686"; NIX_CFLAGS_COMPILE = "-U__i686";
meta = {
homepage = http://www.gnu.org/software/libc/;
description = "The GNU C Library";
};
} }

19
pkgs/top-level/all-packages.nix
View File

@ -2806,16 +2806,17 @@ let
inherit fetchurl stdenv pkgconfig gettext; inherit fetchurl stdenv pkgconfig gettext;
}; };
glibc = useFromStdenv "glibc" glibc = useFromStdenv "glibc" glibc28;
(import ../development/libraries/glibc-2.7 {
inherit fetchurl stdenv kernelHeaders;
#installLocales = false;
});
glibcUnstable = lowPrio (import ../development/libraries/glibc-2.8 { glibc27 = import ../development/libraries/glibc-2.7 {
inherit fetchurl stdenv kernelHeaders; inherit fetchurl stdenv kernelHeaders;
installLocales = getPkgConfig "glibc" "locales" false; #installLocales = false;
}); };
glibc28 = import ../development/libraries/glibc-2.8 {
inherit fetchurl stdenv kernelHeaders;
installLocales = getPkgConfig "glibc" "locales" false;
};
glibc_multi = glibc_multi =
assert system == "x86_64-linux"; assert system == "x86_64-linux";