[arch-commits] CVS update of core/base/klibc (PKGBUILD)

[Thomas Baechler]

    Date: Wednesday, October 31, 2007 @ 09:25:30
  Author: thomas
    Path: /home/cvs-core/core/base/klibc

Modified: PKGBUILD (1.11 -> 1.12)

- compile shared binaries by default
- patch klibc to be able to build klibc-module-init-tools
- don't build insmod
- rebuild against 2.6.23 headers


----------+
 PKGBUILD |   29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)


Index: core/base/klibc/PKGBUILD
diff -u core/base/klibc/PKGBUILD:1.11 core/base/klibc/PKGBUILD:1.12
--- core/base/klibc/PKGBUILD:1.11	Wed Sep 19 20:05:29 2007
+++ core/base/klibc/PKGBUILD	Wed Oct 31 09:25:30 2007
@@ -1,5 +1,6 @@
-#$Id: PKGBUILD,v 1.11 2007/09/19 18:05:29 thomas Exp $
-#Maintainer: Aaron Griffin <aaron at archlinux.org>
+# $Id: PKGBUILD,v 1.12 2007/10/31 08:25:30 thomas Exp $
+# Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Maintainer: Thomas Baechler <thomas at archlinux.org>
 
 ###
 ### NOTE: Do not build this package with anything except gcc - using ccache
@@ -10,18 +11,23 @@
 pkgname=klibc
 pkgver=1.5
 _klibcbranch=Stable #Stable/Testing
-_kver=2.6.22-ARCH
-pkgrel=2
+_kver=2.6.23-ARCH
+pkgrel=3
 pkgdesc="a minimal libc made for early-userspace"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/libs/klibc/"
 license=('BSD')
 groups=('base')
 options=(!ccache)
-source=(http://www.kernel.org/pub/linux/libs/klibc/$_klibcbranch/$pkgname-$pkgver.tar.gz \
-        multiple_raid_assembly_fix.patch)
-md5sums=('d55ce89c0656a7d6896ec0b2af07b5dc' '8d257d50a4554d57b8f461c6a87a2877')
-
+source=(http://www.kernel.org/pub/linux/libs/klibc/$_klibcbranch/$pkgname-$pkgver.tar.gz
+        multiple_raid_assembly_fix.patch
+        klibc-compile-shared-by-default.patch
+        klibc-module-init-tools.patch)
+md5sums=('d55ce89c0656a7d6896ec0b2af07b5dc'
+         '8d257d50a4554d57b8f461c6a87a2877'
+         'c263a7c3fd290fcc84a4e230d456d022'
+         '4d78311ebce63f2fbb711f8518e71839')
+                  
 build()
 {
   cd $startdir/src/$pkgname-$pkgver
@@ -29,7 +35,12 @@
   sed -i "/#define INI_DEBUG/d" usr/kinit/kinit.h
   ln -sf /usr/src/linux-${_kver} linux
 
-  patch -up1 -i ../multiple_raid_assembly_fix.patch
+  patch -p1 -i ../multiple_raid_assembly_fix.patch || return 1
+  # make klibc-module-init-tools compile
+  # don't build insmod
+  patch -p1 -i ../klibc-module-init-tools.patch || return 1
+  # compile binaries shared by default
+  patch -p1 -i ../klibc-compile-shared-by-default.patch
   make EXTRA_KLIBCFLAGS='' || return 1
   make INSTALLROOT=$startdir/pkg install
   #simplify