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

Adding a patch for klibc so it does not fall in a neverending loop.

Browse Source 
It fails building, but at least does not annoy that much.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23640
This commit is contained in:
Lluís Batlle i Rossell 2010-09-05 06:00:14 +00:00
parent bd17763fbb
commit 4869b6304a
2 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/klibc/default.nix
View File

@ -3,7 +3,7 @@
assert stdenv.isLinux; assert stdenv.isLinux;
let let
version = "1.5.18"; version = "1.5.20";
baseMakeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"]; baseMakeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"];
in in
@ -12,8 +12,10 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; url = "mirror://kernel/linux/libs/klibc/1.5/klibc-${version}.tar.bz2";
sha256 = "0ik4ddkfzjrrhpb50i31f2zihqlcnm82yqnl5ci59wx56j5ly474"; sha256 = "07683dn18r3k35d6pp0sn88pqcx7dldqx3m6f2gz45i1j094qp7m";
}; };
patches = [ ./make382.patch ];
makeFlags = baseMakeFlags; makeFlags = baseMakeFlags;

35
pkgs/os-specific/linux/klibc/make382.patch Normal file
View File

@ -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)))