diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-01 21:21:26 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-01 21:21:26 +0000 |
| commit | da3ba13fb57d4c9415f42906772c180f7ac9486c (patch) | |
| tree | 2674fb7d7520c1cdb0c72fb145f2f06357f97f78 /pkgs/os-specific/linux/klibc | |
| parent | 2954596106c5d6e96c9f121573a05baf4bc8630d (diff) | |
| download | nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar.gz nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar.bz2 nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar.lz nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar.xz nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.tar.zst nixpkgs-da3ba13fb57d4c9415f42906772c180f7ac9486c.zip | |
Trying to make gcc 4.5 cross-buildable
svn path=/nixpkgs/branches/stdenv-updates/; revision=22848
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index c3f5db58303..5a27816472d 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -3,7 +3,7 @@ assert stdenv.isLinux; let - version = "1.5.15"; + version = "1.5.18"; baseMakeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"]; in @@ -11,8 +11,8 @@ stdenv.mkDerivation { name = "klibc-${version}"; src = fetchurl { - url = "mirror://kernel/linux/libs/klibc/klibc-${version}.tar.bz2"; - sha256 = "1x401wmjca6zkyikf9xz45b3wb1hnj0m2s9in1sg6xdhi3pk8lwb"; + url = "mirror://kernel/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; + sha256 = "0ik4ddkfzjrrhpb50i31f2zihqlcnm82yqnl5ci59wx56j5ly474"; }; makeFlags = baseMakeFlags; @@ -20,17 +20,14 @@ stdenv.mkDerivation { inherit linuxHeaders; crossAttrs = { - name = "klibc-1.5.17"; - src = fetchurl { - url = "mirror://kernel/linux/libs/klibc/Testing/klibc-1.5.17.tar.bz2"; - sha256 = "1jmiszf9pdlzj9f72nkv50d7aqrzz12hrmw792xnd2lmn5nrfyx6"; - }; - makeFlags = baseMakeFlags ++ [ "CROSS_COMPILE=${stdenv.cross.config}-" "KLIBCARCH=${stdenv.cross.arch}" ]; patchPhase = '' + sed -i 's/-fno-pic -mno-abicalls/& -mabi=32/' usr/klibc/arch/mips/MCONFIG sed -i /KLIBCKERNELSRC/d scripts/Kbuild.install + # Wrong check for __mips64 in klibc + sed -i s/__mips64__/__mips64/ usr/include/fcntl.h ''; linuxHeaders = linuxHeadersCross; |