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

Adding ports to glibc-2.11.

Browse Source 
Making glibc-2.11 the default in cross-compiling and also for the native armv5tel.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18744
This commit is contained in:
Lluís Batlle i Rossell 2009-12-01 21:33:11 +00:00
parent 980d7c04a0
commit 8910d4e646
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/glibc-2.11/common.nix
View File

@ -1,8 +1,8 @@
/* Build configuration used to build glibc, Info files, and locale /* Build configuration used to build glibc, Info files, and locale
information. */ information. */
{ name, fetchurl, stdenv, installLocales ? false cross : { name, fetchurl, stdenv, installLocales ? false
, cross ? null, gccCross ? null, kernelHeaders ? null , gccCross ? null, kernelHeaders ? null
, profilingLibraries ? false, meta, ... }@args : , profilingLibraries ? false, meta, ... }@args :
let version = "2.11"; let version = "2.11";
@ -107,6 +107,11 @@ stdenv.mkDerivation ({
sha256 = "0b6nbr89qmqcvzz26ggnw7gcxhvnzbc8z299h12wqjmcix4hxwcy"; sha256 = "0b6nbr89qmqcvzz26ggnw7gcxhvnzbc8z299h12wqjmcix4hxwcy";
}; };
srcPorts = fetchurl {
url = "mirror://gnu/glibc/glibc-ports-${version}.tar.bz2";
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;
@ -119,6 +124,9 @@ stdenv.mkDerivation ({
# built yet in the bootstrap. # built yet in the bootstrap.
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"
mkdir ../build mkdir ../build
cd ../build cd ../build

6
pkgs/development/libraries/glibc-2.11/default.nix
View File

@ -8,11 +8,11 @@ let
build = import ./common.nix; build = import ./common.nix;
cross = if gccCross != null then gccCross.target else null; cross = if gccCross != null then gccCross.target else null;
in in
build ({ build cross ({
name = "glibc"; name = "glibc";
inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries inherit fetchurl stdenv kernelHeaders installLocales profilingLibraries
cross; gccCross;
builder = ./builder.sh; builder = ./builder.sh;
@ -45,7 +45,7 @@ EOF
export AR="$crossConfig-ar" export AR="$crossConfig-ar"
export RANLIB="$crossConfig-ranlib" export RANLIB="$crossConfig-ranlib"
dontStrip = 1 dontStrip=1
''; '';
} }
else {})) else {}))

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

@ -3429,8 +3429,7 @@ let
haveBrokenRedHatKernel = haveRedHatKernel && getConfig ["brokenRedHatKernel"] false; haveBrokenRedHatKernel = haveRedHatKernel && getConfig ["brokenRedHatKernel"] false;
in in
useFromStdenv "glibc" (if haveBrokenRedHatKernel then glibc25 else useFromStdenv "glibc" (if haveBrokenRedHatKernel then glibc25 else
# glibc211 does not have ports still. glibc211);
if (system == "armv5tel-linux") then glibc210 else glibc211);
glibc25 = import ../development/libraries/glibc-2.5 { glibc25 = import ../development/libraries/glibc-2.5 {
inherit fetchurl stdenv kernelHeaders; inherit fetchurl stdenv kernelHeaders;
@ -3454,6 +3453,11 @@ let
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}); });
glibc210 = makeOverridable (import ../development/libraries/glibc-2.10) {
inherit fetchurl stdenv kernelHeaders;
installLocales = getPkgConfig "glibc" "locales" false;
};
glibc210Cross = cross: forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.10) { glibc210Cross = cross: forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.10) {
inherit stdenv fetchurl; inherit stdenv fetchurl;
gccCross = gccCrossStageStatic cross; gccCross = gccCrossStageStatic cross;
@ -3461,26 +3465,19 @@ let
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}); });
glibcCross = cross: glibc210Cross cross;
glibc210 = makeOverridable (import ../development/libraries/glibc-2.10) {
inherit fetchurl stdenv kernelHeaders;
installLocales = getPkgConfig "glibc" "locales" false;
};
glibc211 = makeOverridable (import ../development/libraries/glibc-2.11) { glibc211 = makeOverridable (import ../development/libraries/glibc-2.11) {
inherit fetchurl stdenv kernelHeaders; inherit fetchurl stdenv kernelHeaders;
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}; };
glibc211CrossReal = cross : forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11) { glibc211Cross = cross : forceBuildDrv (makeOverridable (import ../development/libraries/glibc-2.11) {
inherit stdenv fetchurl cross; inherit stdenv fetchurl;
gccCross = gccCrossStageStatic cross; gccCross = gccCrossStageStatic cross;
kernelHeaders = kernelHeadersCross cross; kernelHeaders = kernelHeadersCross cross;
installLocales = getPkgConfig "glibc" "locales" false; installLocales = getPkgConfig "glibc" "locales" false;
}); });
glibc211Cross = cross : forceBuildDrv (glibc211CrossReal cross); glibcCross = cross: glibc211Cross cross;
eglibc = import ../development/libraries/eglibc { eglibc = import ../development/libraries/eglibc {
inherit fetchsvn stdenv kernelHeaders; inherit fetchsvn stdenv kernelHeaders;