diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2008-06-26 18:18:10 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2008-06-26 18:18:10 +0000 |
| commit | 05216bdcf02cb53573bc3ee99a5a39a375463f01 (patch) | |
| tree | 9ac21acc796d87e0ddbdb36dea7e92d25eb7f0a0 /dev-libs/klibc/files | |
| parent | Typo (diff) | |
| download | gentoo-2-05216bdcf02cb53573bc3ee99a5a39a375463f01.tar.gz gentoo-2-05216bdcf02cb53573bc3ee99a5a39a375463f01.tar.bz2 gentoo-2-05216bdcf02cb53573bc3ee99a5a39a375463f01.zip | |
Version bump per bug #217738, and also fix x86_64 io.h header per bug #229525.
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64)
Diffstat (limited to 'dev-libs/klibc/files')
| -rw-r--r-- | dev-libs/klibc/files/klibc-1.5.11-klibcasmarch.patch | 26 | ||||
| -rw-r--r-- | dev-libs/klibc/files/klibc-1.5.11-x86_64-io.h-return.diff | 28 |
2 files changed, 54 insertions, 0 deletions
diff --git a/dev-libs/klibc/files/klibc-1.5.11-klibcasmarch.patch b/dev-libs/klibc/files/klibc-1.5.11-klibcasmarch.patch new file mode 100644 index 000000000000..0404a66a1ef1 --- /dev/null +++ b/dev-libs/klibc/files/klibc-1.5.11-klibcasmarch.patch @@ -0,0 +1,26 @@ +diff -Nuar --exclude '*.orig' --exclude '*.rej' klibc-1.5.11.orig/scripts/Kbuild.install klibc-1.5.11/scripts/Kbuild.install +--- klibc-1.5.11.orig/scripts/Kbuild.install 2008-06-15 17:28:23.000000000 -0700 ++++ klibc-1.5.11/scripts/Kbuild.install 2008-06-26 10:14:05.365949576 -0700 +@@ -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 asm asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \ ++ $(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \ + for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \ + $(KLIBCKERNELOBJ)/include2 ; do \ + [ ! -d $$r/$$d ] && continue; \ diff --git a/dev-libs/klibc/files/klibc-1.5.11-x86_64-io.h-return.diff b/dev-libs/klibc/files/klibc-1.5.11-x86_64-io.h-return.diff new file mode 100644 index 000000000000..8ed2fa044cc9 --- /dev/null +++ b/dev-libs/klibc/files/klibc-1.5.11-x86_64-io.h-return.diff @@ -0,0 +1,28 @@ +diff -Naur klibc-1.5.8.orig/usr/include/arch/x86_64/sys/io.h klibc-1.5.8/usr/include/arch/x86_64/sys/io.h +--- klibc-1.5.8.orig/usr/include/arch/x86_64/sys/io.h 2007-12-11 18:20:29.000000000 +0100 ++++ klibc-1.5.8/usr/include/arch/x86_64/sys/io.h 2008-06-26 12:04:22.760046895 +0200 +@@ -60,21 +60,21 @@ + { + unsigned char __v; + asm volatile ("inb %1,%0" : "=a" (__v) : "dN"(__p)); +- return v; ++ return __v; + } + + static __inline__ unsigned short inw(unsigned short __p) + { + unsigned short __v; + asm volatile ("inw %1,%0" : "=a" (__v) : "dN"(__p)); +- return v; ++ return __v; + } + + static __inline__ unsigned int inl(unsigned short __p) + { + unsigned int __v; + asm volatile ("inl %1,%0" : "=a" (__v) : "dN"(__p)); +- return v; ++ return __v; + } + + /* String I/O macros */ |