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

* A function `useKlibc' to build a package using klibc as the C

Browse Source 
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
This commit is contained in:
Eelco Dolstra
2008-08-08 19:05:32 +00:00
parent e920df26c6
commit a9d19f45db
7 changed files with 39 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/klibc/builder.sh
+3 -2
View File
@@ -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)
pkgs/os-specific/linux/klibc/default.nix
+3 -1
View File
@@ -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];
}
pkgs/os-specific/linux/klibc/install.patch
-28
View File
@@ -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