diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-11-12 10:39:23 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-11-12 10:40:29 -0800 |
| commit | 9ea5e56d701a4841150b5c17cc229b5a714a8f47 (patch) | |
| tree | cccf682348a21afe0528d281bbeb502336b50e28 /recipes | |
| parent | c29c0219c02010493d241113f8c9718eee6fc269 (diff) | |
klibc-1.5.15: Unbreak the build for x86 with kernels < 2.6.31
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/klibc/klibc-1.5.15/signal-cleanup.patch | 22 | ||||
| -rw-r--r-- | recipes/klibc/klibc_1.5.15.bb | 2 |
2 files changed, 15 insertions, 9 deletions
diff --git a/recipes/klibc/klibc-1.5.15/signal-cleanup.patch b/recipes/klibc/klibc-1.5.15/signal-cleanup.patch index fd41f4d7b7..c64cd5bbb6 100644 --- a/recipes/klibc/klibc-1.5.15/signal-cleanup.patch +++ b/recipes/klibc/klibc-1.5.15/signal-cleanup.patch @@ -1,21 +1,27 @@ Description: Cope with header changes in kernel commit 63b852a6b67d0820d388b0ecd0da83ccb4048b8d. -diff -Nur -x '*.orig' -x '*~' klibc-1.5.15/usr/include/arch/i386/klibc/archsignal.h klibc-1.5.15.new/usr/include/arch/i386/klibc/archsignal.h ---- klibc-1.5.15/usr/include/arch/i386/klibc/archsignal.h 2009-10-04 23:10:17.000000000 +0100 -+++ klibc-1.5.15.new/usr/include/arch/i386/klibc/archsignal.h 2009-10-05 09:35:14.000000000 +0100 -@@ -96,7 +96,7 @@ +Index: klibc-1.5.15/usr/include/arch/i386/klibc/archsignal.h +=================================================================== +--- klibc-1.5.15.orig/usr/include/arch/i386/klibc/archsignal.h 2009-01-04 11:28:03.000000000 -0800 ++++ klibc-1.5.15/usr/include/arch/i386/klibc/archsignal.h 2009-11-11 14:21:10.000000000 -0800 +@@ -96,7 +96,12 @@ typedef struct { #define MINSIGSTKSZ 2048 #define SIGSTKSZ 8192 --#include <asm-generic/signal.h> ++#include <linux/version.h> ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31) +#include <asm-generic/signal-defs.h> ++#else + #include <asm-generic/signal.h> ++#endif /* This uses gcc anonymous union support... */ struct siginfo; -diff -Nur -x '*.orig' -x '*~' klibc-1.5.15/usr/include/arch/sparc/klibc/archsignal.h klibc-1.5.15.new/usr/include/arch/sparc/klibc/archsignal.h ---- klibc-1.5.15/usr/include/arch/sparc/klibc/archsignal.h 2009-01-04 19:28:03.000000000 +0000 -+++ klibc-1.5.15.new/usr/include/arch/sparc/klibc/archsignal.h 2009-10-05 09:37:31.000000000 +0100 +Index: klibc-1.5.15/usr/include/arch/sparc/klibc/archsignal.h +=================================================================== +--- klibc-1.5.15.orig/usr/include/arch/sparc/klibc/archsignal.h 2009-01-04 11:28:03.000000000 -0800 ++++ klibc-1.5.15/usr/include/arch/sparc/klibc/archsignal.h 2009-11-09 15:06:29.000000000 -0800 @@ -11,13 +11,6 @@ #define __WANT_POSIX1B_SIGNALS__ #include <asm/signal.h> diff --git a/recipes/klibc/klibc_1.5.15.bb b/recipes/klibc/klibc_1.5.15.bb index 31c4fbca3d..777dcd2c3c 100644 --- a/recipes/klibc/klibc_1.5.15.bb +++ b/recipes/klibc/klibc_1.5.15.bb @@ -1,4 +1,4 @@ require klibc_1.5.15.inc -PR = "r3" +PR = "r4" KLIBC_FETCHDIR = "Testing" |