diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-01-19 14:53:45 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-01-19 14:53:45 +0000 |
| commit | 3bcc2464bd20a6a713bb381f64b0f6f75b7c2553 (patch) | |
| tree | 18659b1239fbb7112ad329c2c488a642b239de73 | |
| parent | 2665f08604ea948344b1758c34bfe63ee669a5fb (diff) | |
[toolchain] backport patch to allow building uClibc-0.9.28.2 on recent x86 kernels
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14105 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | toolchain/uClibc/patches/0.9.28.2/180-fix_kernel_types_with_recent_kernel.patch | 18 | ||||
| -rw-r--r-- | toolchain/uClibc/patches/0.9.28.2/190-uml_x86_64_hack.patch | 13 |
2 files changed, 18 insertions, 13 deletions
diff --git a/toolchain/uClibc/patches/0.9.28.2/180-fix_kernel_types_with_recent_kernel.patch b/toolchain/uClibc/patches/0.9.28.2/180-fix_kernel_types_with_recent_kernel.patch new file mode 100644 index 000000000..829aaca5e --- /dev/null +++ b/toolchain/uClibc/patches/0.9.28.2/180-fix_kernel_types_with_recent_kernel.patch @@ -0,0 +1,18 @@ +--- uClibc-0.9.28.2-old/libc/sysdeps/linux/i386/bits/kernel_types.h 2004-02-06 08:07:16.000000000 +0100 ++++ uClibc-0.9.28.2-new/libc/sysdeps/linux/i386/bits/kernel_types.h 2009-01-18 07:24:34.994293859 +0100 +@@ -4,7 +4,14 @@ + * our private content, and not the kernel header, will win. + * -Erik + */ +-#ifndef __ARCH_I386_POSIX_TYPES_H ++#if !defined(__ARCH_I386_POSIX_TYPES_H) && \ ++ !defined(_ASM_X86_64_POSIX_TYPES_H) && \ ++ !defined(_ASM_X86_POSIX_TYPES_32_H) && \ ++ !defined(_ASM_X86_POSIX_TYPES_64_H) ++ ++#define _ASM_X86_POSIX_TYPES_32_H ++#define _ASM_X86_POSIX_TYPES_64_H ++#define _ASM_X86_64_POSIX_TYPES_H + #define __ARCH_I386_POSIX_TYPES_H + + typedef unsigned short __kernel_dev_t; diff --git a/toolchain/uClibc/patches/0.9.28.2/190-uml_x86_64_hack.patch b/toolchain/uClibc/patches/0.9.28.2/190-uml_x86_64_hack.patch deleted file mode 100644 index fbb5f5cfa..000000000 --- a/toolchain/uClibc/patches/0.9.28.2/190-uml_x86_64_hack.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur uclibc.old/libc/sysdeps/linux/i386/bits/kernel_types.h uclibc.dev/libc/sysdeps/linux/i386/bits/kernel_types.h ---- uclibc.old/libc/sysdeps/linux/i386/bits/kernel_types.h 2005-08-18 00:49:43.000000000 +0200 -+++ uclibc.dev/libc/sysdeps/linux/i386/bits/kernel_types.h 2006-12-14 07:58:19.000000000 +0100 -@@ -4,7 +4,8 @@ - * our private content, and not the kernel header, will win. - * -Erik - */ --#ifndef __ARCH_I386_POSIX_TYPES_H -+#if !defined(__ARCH_I386_POSIX_TYPES_H) && !defined(_ASM_X86_64_POSIX_TYPES_H) -+#define _ASM_X86_64_POSIX_TYPES_H - #define __ARCH_I386_POSIX_TYPES_H - - typedef unsigned short __kernel_dev_t; |