ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 13:08:39 +03:00
Code Issues Projects Releases Wiki Activity

klibc 1.5.24

Browse Source 
svn path=/nixpkgs/trunk/; revision=30008
This commit is contained in:
Shea Levy 2011-10-25 08:20:03 +00:00
parent 6638835c93
commit e0e4770ec9
2 changed files with 3 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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