diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-09-05 06:00:14 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-09-05 06:00:14 +0000 |
| commit | 4869b6304af6e69c2738838549471b31d25fb434 (patch) | |
| tree | 44f24f61ec48a4b3c950a822f698d1458f5ab6cf /pkgs/os-specific/linux/klibc | |
| parent | bd17763fbbd70c185d2e7338ea37518032c880b6 (diff) | |
| download | nixlib-4869b6304af6e69c2738838549471b31d25fb434.tar nixlib-4869b6304af6e69c2738838549471b31d25fb434.tar.gz nixlib-4869b6304af6e69c2738838549471b31d25fb434.tar.bz2 nixlib-4869b6304af6e69c2738838549471b31d25fb434.tar.lz nixlib-4869b6304af6e69c2738838549471b31d25fb434.tar.xz nixlib-4869b6304af6e69c2738838549471b31d25fb434.tar.zst nixlib-4869b6304af6e69c2738838549471b31d25fb434.zip | |
Adding a patch for klibc so it does not fall in a neverending loop.
It fails building, but at least does not annoy that much. svn path=/nixpkgs/branches/stdenv-updates/; revision=23640
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
| -rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/klibc/make382.patch | 35 |
2 files changed, 39 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 5a27816472db..02641a5a16bb 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.18"; + version = "1.5.20"; baseMakeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"]; in @@ -12,8 +12,10 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kernel/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; - sha256 = "0ik4ddkfzjrrhpb50i31f2zihqlcnm82yqnl5ci59wx56j5ly474"; + sha256 = "07683dn18r3k35d6pp0sn88pqcx7dldqx3m6f2gz45i1j094qp7m"; }; + + patches = [ ./make382.patch ]; makeFlags = baseMakeFlags; diff --git a/pkgs/os-specific/linux/klibc/make382.patch b/pkgs/os-specific/linux/klibc/make382.patch new file mode 100644 index 000000000000..e9e9aba4e792 --- /dev/null +++ b/pkgs/os-specific/linux/klibc/make382.patch @@ -0,0 +1,35 @@ +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))) |