From a9d19f45db93c154669a1def320101b0ac79b9d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Aug 2008 19:05:32 +0000
Subject: * A function `useKlibc' to build a package using klibc as the C  
 library. * Removed devicemapperStatic, e2fsprogsDiet, lvm2Static since
 they're   redundant (it's what you get when you use pkgsDiet/pkgsStatic).

svn path=/nixpkgs/trunk/; revision=12554
---
 pkgs/os-specific/linux/klibc/builder.sh    |  5 +++--
 pkgs/os-specific/linux/klibc/default.nix   |  4 +++-
 pkgs/os-specific/linux/klibc/install.patch | 28 ----------------------------
 3 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/klibc/install.patch

(limited to 'pkgs/os-specific/linux/klibc')

diff --git a/pkgs/os-specific/linux/klibc/builder.sh b/pkgs/os-specific/linux/klibc/builder.sh
index ef101b466f17..7bb77608cf9b 100644
--- a/pkgs/os-specific/linux/klibc/builder.sh
+++ b/pkgs/os-specific/linux/klibc/builder.sh
@@ -2,8 +2,9 @@ source $stdenv/setup
 
 preBuild=preBuild
 preBuild() {
-  mkdir -p linux/include
-  ln -s $kernel/lib/modules/*/build/include/* linux/include/
+    mkdir -p linux/include
+    cp -prd $kernel/lib/modules/*/build/include/* linux/include/
+    chmod -R u+w linux/include/
 }
 
 makeFlagsArray=(V=1 prefix=$out SHLIBDIR=$out/lib)
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index e8bb789d18d4..ada9d599d51a 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -8,8 +8,10 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = mirror://kernel/linux/libs/klibc/klibc-1.5.tar.bz2;
     sha256 = "1izhf8kscjymsvsvhcqw9awnmp94vwv70zdj09srg9bkpjj0n017";
+#    url = mirror://kernel/linux/libs/klibc/Testing/klibc-1.5.14.tar.bz2;
+#    sha256 = "1cmrqpgamnv2ns7dlxjm61zc88dxm4ff0aya413ij1lmhp2h2sfc";
   };
   inherit kernel;
   buildInputs = [perl bison mktemp];
-  patches = [./install.patch];
+  #patches = [./install.patch];
 }
diff --git a/pkgs/os-specific/linux/klibc/install.patch b/pkgs/os-specific/linux/klibc/install.patch
deleted file mode 100644
index a5db5c098565..000000000000
--- a/pkgs/os-specific/linux/klibc/install.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -rc klibc-1.4-orig/scripts/Kbuild.install klibc-1.4/scripts/Kbuild.install
-*** klibc-1.4-orig/scripts/Kbuild.install	2006-06-19 03:17:15.000000000 +0200
---- klibc-1.4/scripts/Kbuild.install	2006-11-25 22:41:09.000000000 +0100
-***************
-*** 96,107 ****
-  	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
-  	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
-  	$(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
-! 	  mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
-! 	  for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
-! 	           $(KLIBCKERNELOBJ)/include2 ; do \
-  	    [ ! -d $$r/$$d ] || \
-! 	      cp -rfL $$r/$$d/. \
-! 	          $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d/. ; \
-  	  done ; \
-  	done
-  	$(Q)cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(KLIBCARCH) asm
---- 96,105 ----
-  	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
-  	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
-  	$(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
-! 	  for r in $(KLIBCKERNELSRC)/include ; do \
-  	    [ ! -d $$r/$$d ] || \
-! 	      cp -rd $$r/$$d \
-! 	          $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d ; \
-  	  done ; \
-  	done
-  	$(Q)cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(KLIBCARCH) asm
-- 
cgit 1.4.1