diff options
| author | Shea Levy <shea@shealevy.com> | 2011-10-25 08:20:03 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-10-25 08:20:03 +0000 |
| commit | e0e4770ec96d35c1f8bab4bda4a629dd747c704a (patch) | |
| tree | ebd7a8e01536d2eed90530c66656ed629c94422a /pkgs/os-specific/linux/klibc | |
| parent | 6638835c9399e212acdf882791d239d823f1ccef (diff) | |
| download | nixlib-e0e4770ec96d35c1f8bab4bda4a629dd747c704a.tar nixlib-e0e4770ec96d35c1f8bab4bda4a629dd747c704a.tar.gz nixlib-e0e4770ec96d35c1f8bab4bda4a629dd747c704a.tar.bz2 nixlib-e0e4770ec96d35c1f8bab4bda4a629dd747c704a.tar.lz nixlib-e0e4770ec96d35c1f8bab4bda4a629dd747c704a.tar.xz nixlib-e0e4770ec96d35c1f8bab4bda4a629dd747c704a.tar.zst nixlib-e0e4770ec96d35c1f8bab4bda4a629dd747c704a.zip | |
klibc 1.5.24
svn path=/nixpkgs/trunk/; revision=30008
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/klibc/make382.patch | 35 |
2 files changed, 3 insertions, 40 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index b8cd2b18bc7c..d71b97b9c7d3 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.20"; + version = "1.5.24"; baseMakeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"]; in @@ -11,12 +11,10 @@ stdenv.mkDerivation { name = "klibc-${version}"; src = fetchurl { - url = "mirror://kernel/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; - sha256 = "07683dn18r3k35d6pp0sn88pqcx7dldqx3m6f2gz45i1j094qp7m"; + url = "http://ftp.eu.openbsd.org/pub/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; + sha256 = "18lm32dlj9k2ky9wwk274zmc3jndgrb41b6qm82g3lza6wlw3yki"; }; - patches = [ ./make382.patch ]; - # Trick to make this build on nix. It expects to have the kernel sources # instead of only the linux kernel headers. # So it cannot run the 'make headers_install' it wants to run. diff --git a/pkgs/os-specific/linux/klibc/make382.patch b/pkgs/os-specific/linux/klibc/make382.patch deleted file mode 100644 index e9e9aba4e792..000000000000 --- a/pkgs/os-specific/linux/klibc/make382.patch +++ /dev/null @@ -1,35 +0,0 @@ -To avoid an endless loop with gnumake 3.82 -http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg228690.html - -Index: packages/klibc/klibc-make.patch ---- klibc-1.5.19/scripts/Kbuild.include.orig 2010-08-19 09:39:45.986816591 -0200 -+++ klibc-1.5.19/scripts/Kbuild.include 2010-08-19 09:49:15.010816591 -0200 -@@ -127,7 +127,7 @@ - # >'< substitution is for echo to work, >$< substitution to preserve $ when reloading .cmd file - # note: when using inline perl scripts [perl -e '...$$t=1;...'] in $(cmd_xxx) double $$ your perl vars - # --if_changed = $(if $(strip $(filter-out $(PHONY),$?) \ -+if_changed = $(if $(strip $(filter-out $(PHONY) FORCE,$?) \ - $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \ - @set -e; \ - $(echo-cmd) $(cmd_$(1)); \ -@@ -135,7 +135,7 @@ - - # execute the command and also postprocess generated .d dependencies - # file --if_changed_dep = $(if $(strip $(filter-out $(PHONY),$?) \ -+if_changed_dep = $(if $(strip $(filter-out $(PHONY) FORCE,$?) \ - $(filter-out FORCE $(wildcard $^),$^) \ - $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ), \ - @set -e; \ -@@ -147,7 +147,7 @@ - # Usage: $(call if_changed_rule,foo) - # will check if $(cmd_foo) changed, or any of the prequisites changed, - # and if so will execute $(rule_foo) --if_changed_rule = $(if $(strip $(filter-out $(PHONY),$?) \ -+if_changed_rule = $(if $(strip $(filter-out $(PHONY) FORCE,$?) \ - $(call arg-check, $(cmd_$(1)), $(cmd_$@)) ),\ - @set -e; \ - $(rule_$(1))) |