[arch-commits] CVS update of core/base/klibc (4 files)
Thomas Baechler
thomas at archlinux.org
Wed Feb 27 19:07:38 UTC 2008
Date: Wednesday, February 27, 2008 @ 20:07:38
Author: thomas
Path: /home/cvs-core/core/base/klibc
Added: klibc-2.6.24.patch (1.1)
Modified: PKGBUILD (1.13 -> 1.14)
Removed: klibc-1.5-2.6.24-asmarch.patch (1.1)
klibc-1.5-klibcasmarch.patch (1.1)
compile against 2.6.24
--------------------------------+
PKGBUILD | 13 ++++-------
klibc-1.5-2.6.24-asmarch.patch | 17 ---------------
klibc-1.5-klibcasmarch.patch | 25 ----------------------
klibc-2.6.24.patch | 44 +++++++++++++++++++++++++++++++++++++++
4 files changed, 49 insertions(+), 50 deletions(-)
Index: core/base/klibc/PKGBUILD
diff -u core/base/klibc/PKGBUILD:1.13 core/base/klibc/PKGBUILD:1.14
--- core/base/klibc/PKGBUILD:1.13 Mon Jan 28 18:28:23 2008
+++ core/base/klibc/PKGBUILD Wed Feb 27 20:07:37 2008
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.13 2008/01/28 17:28:23 thomas Exp $
+# $Id: PKGBUILD,v 1.14 2008/02/27 19:07:37 thomas Exp $
# Maintainer: Aaron Griffin <aaron at archlinux.org>
# Maintainer: Thomas Baechler <thomas at archlinux.org>
@@ -18,19 +18,17 @@
url="http://www.kernel.org/pub/linux/libs/klibc/"
license=('BSD')
groups=('base')
-options=(!ccache)
+options=(!ccache !strip)
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
- klibc-1.5-2.6.24-asmarch.patch
- klibc-1.5-klibcasmarch.patch)
+ klibc-2.6.24.patch)
md5sums=('d55ce89c0656a7d6896ec0b2af07b5dc'
'8d257d50a4554d57b8f461c6a87a2877'
'c263a7c3fd290fcc84a4e230d456d022'
'4d78311ebce63f2fbb711f8518e71839'
- 'b8ba229af36d7c23a658160871a049bf'
- 'aab928db6a0d81f108a7aeb552acf215')
+ 'a98b3e96aff53339572ed0bdccc8aed2')
build()
{
@@ -46,8 +44,7 @@
# compile binaries shared by default
patch -p1 -i ../klibc-compile-shared-by-default.patch
# fix compilation on 2.6.24
- patch -p1 -i ../klibc-1.5-2.6.24-asmarch.patch || return 1
- patch -p1 -i ../klibc-1.5-klibcasmarch.patch || return 1
+ patch -p1 -i ../klibc-2.6.24.patch || return 1
make EXTRA_KLIBCFLAGS='' || return 1
make INSTALLROOT=$startdir/pkg install
#simplify
Index: core/base/klibc/klibc-1.5-2.6.24-asmarch.patch
diff -u core/base/klibc/klibc-1.5-2.6.24-asmarch.patch:1.1 core/base/klibc/klibc-1.5-2.6.24-asmarch.patch:removed
--- core/base/klibc/klibc-1.5-2.6.24-asmarch.patch:1.1 Mon Jan 28 18:28:23 2008
+++ core/base/klibc/klibc-1.5-2.6.24-asmarch.patch Wed Feb 27 20:07:38 2008
@@ -1,17 +0,0 @@
-diff -Nur klibc-1.5.orig/usr/klibc/arch/i386/MCONFIG klibc-1.5/usr/klibc/arch/i386/MCONFIG
---- klibc-1.5.orig/usr/klibc/arch/i386/MCONFIG 2007-03-04 02:52:10.000000000 +0100
-+++ klibc-1.5/usr/klibc/arch/i386/MCONFIG 2008-01-27 16:06:08.000000000 +0100
-@@ -31,3 +31,4 @@
- # calls, and work on the memory models for this architecture
- # 96 MB - normal binaries start at 128 MB
- KLIBCSHAREDFLAGS = -Ttext 0x06000200
-+KLIBCASMARCH = x86
-diff -Nur klibc-1.5.orig/usr/klibc/arch/x86_64/MCONFIG klibc-1.5/usr/klibc/arch/x86_64/MCONFIG
---- klibc-1.5.orig/usr/klibc/arch/x86_64/MCONFIG 2007-03-04 02:52:10.000000000 +0100
-+++ klibc-1.5/usr/klibc/arch/x86_64/MCONFIG 2008-01-27 16:05:43.000000000 +0100
-@@ -36,4 +36,4 @@
- KLIBCSHAREDFLAGS = -Ttext 0x00200200 -z max-page-size=0x100000
-
- # Additional asm- directories needed during installation
--ASMARCH = asm-i386
-+KLIBCASMARCH = x86
Index: core/base/klibc/klibc-1.5-klibcasmarch.patch
diff -u core/base/klibc/klibc-1.5-klibcasmarch.patch:1.1 core/base/klibc/klibc-1.5-klibcasmarch.patch:removed
--- core/base/klibc/klibc-1.5-klibcasmarch.patch:1.1 Mon Jan 28 18:28:23 2008
+++ core/base/klibc/klibc-1.5-klibcasmarch.patch Wed Feb 27 20:07:38 2008
@@ -1,25 +0,0 @@
---- a/scripts/Kbuild.install 2007-03-04 02:52:10.000000000 +0100
-+++ b/scripts/Kbuild.install 2007-11-04 15:43:28.000000000 +0100
-@@ -84,6 +84,13 @@
- # 1) Create directories, install headers and man pages
- # 2) Tell that we now install binaries
- # 3) Install binaries by descending
-+
-+# Arch specific definitions for klibc
-+include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG
-+
-+# include/asm-* architecture
-+KLIBCASMARCH ?= $(KLIBCARCH)
-+
- .PHONY: header footer descend
- header:
- $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
-@@ -95,7 +102,7 @@
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- $(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 \
-+ $(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \
- mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
- for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
- $(KLIBCKERNELOBJ)/include2 ; do \
Index: core/base/klibc/klibc-2.6.24.patch
diff -u /dev/null core/base/klibc/klibc-2.6.24.patch:1.1
--- /dev/null Wed Feb 27 20:07:38 2008
+++ core/base/klibc/klibc-2.6.24.patch Wed Feb 27 20:07:37 2008
@@ -0,0 +1,44 @@
+unchanged:
+--- klibc-1.5.orig/usr/klibc/arch/i386/MCONFIG 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/klibc/arch/i386/MCONFIG 2008-01-27 16:06:08.000000000 +0100
+@@ -31,3 +31,4 @@
+ # calls, and work on the memory models for this architecture
+ # 96 MB - normal binaries start at 128 MB
+ KLIBCSHAREDFLAGS = -Ttext 0x06000200
++KLIBCASMARCH = x86
+unchanged:
+--- klibc-1.5.orig/usr/klibc/arch/x86_64/MCONFIG 2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/klibc/arch/x86_64/MCONFIG 2008-01-27 16:05:43.000000000 +0100
+@@ -36,4 +36,4 @@
+ KLIBCSHAREDFLAGS = -Ttext 0x00200200 -z max-page-size=0x100000
+
+ # Additional asm- directories needed during installation
+-ASMARCH = asm-i386
++KLIBCASMARCH = x86
+only in patch2:
+unchanged:
+--- a/scripts/Kbuild.install 2007-03-04 02:52:10.000000000 +0100
++++ b/scripts/Kbuild.install 2007-11-04 15:43:28.000000000 +0100
+@@ -84,6 +84,13 @@
+ # 1) Create directories, install headers and man pages
+ # 2) Tell that we now install binaries
+ # 3) Install binaries by descending
++
++# Arch specific definitions for klibc
++include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG
++
++# include/asm-* architecture
++KLIBCASMARCH ?= $(KLIBCARCH)
++
+ .PHONY: header footer descend
+ header:
+ $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
+@@ -95,7 +102,7 @@
+ $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ $(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 \
++ $(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \
+ mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
+ for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
+ $(KLIBCKERNELOBJ)/include2 ; do \
More information about the arch-commits
mailing list