diff options
author | Khem Raj <raj.khem@gmail.com> | 2013-11-07 05:35:00 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-08 17:31:36 +0000 |
commit | 4fdc3d77d4a875b7236536bf78849a4d1f6a7449 (patch) | |
tree | 1348999159343a30726c10de2c56ea15f2f03918 /meta/recipes-core | |
parent | 4feed78e5ee8441a87a126b377ca464ac2c49db6 (diff) | |
download | poky-4fdc3d77d4a875b7236536bf78849a4d1f6a7449.tar.gz |
kbd: Fix stdarg related errors on uclibc
It does not get stdarg.h included indirectly as it happens
on uclibc due to different include chain
(From OE-Core rev: eac8cb7cacab7f2fb392128aa5ebc2046ca4a793)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/kbd/kbd/uclibc-stdarg.patch | 36 | ||||
-rw-r--r-- | meta/recipes-core/kbd/kbd_2.0.1.bb | 4 |
2 files changed, 39 insertions, 1 deletions
diff --git a/meta/recipes-core/kbd/kbd/uclibc-stdarg.patch b/meta/recipes-core/kbd/kbd/uclibc-stdarg.patch new file mode 100644 index 0000000000..be7f324acc --- /dev/null +++ b/meta/recipes-core/kbd/kbd/uclibc-stdarg.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | In file included from keymap.h:5:0, | ||
2 | from ksyms.c:6: | ||
3 | ./keymap/common.h:65:38: error: unknown type name 'va_list' | ||
4 | const char *format, va_list args), | ||
5 | ^ | ||
6 | ./keymap/common.h:66:3: error: expected ';', ',' or ')' before 'const' | ||
7 | const void *data); | ||
8 | ^ | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | Index: kbd-2.0.0/src/libkeymap/contextP.h | ||
13 | =================================================================== | ||
14 | --- kbd-2.0.0.orig/src/libkeymap/contextP.h 2013-08-13 06:46:23.000000000 -0700 | ||
15 | +++ kbd-2.0.0/src/libkeymap/contextP.h 2013-11-05 22:33:49.200528226 -0800 | ||
16 | @@ -2,7 +2,7 @@ | ||
17 | #define LK_CONTEXTP_H | ||
18 | |||
19 | #include "keymap.h" | ||
20 | - | ||
21 | +#include <stdarg.h> | ||
22 | /** | ||
23 | * @brief Copy of struct kbdiacruc. | ||
24 | */ | ||
25 | Index: kbd-2.0.0/src/libkeymap/keymap/common.h | ||
26 | =================================================================== | ||
27 | --- kbd-2.0.0.orig/src/libkeymap/keymap/common.h 2013-08-13 06:46:23.000000000 -0700 | ||
28 | +++ kbd-2.0.0/src/libkeymap/keymap/common.h 2013-11-05 22:33:59.964528438 -0800 | ||
29 | @@ -6,6 +6,7 @@ | ||
30 | */ | ||
31 | |||
32 | #include <keymap/context.h> | ||
33 | +#include <stdarg.h> | ||
34 | |||
35 | /** Initializes the structures necessary to read and/or parse keymap. | ||
36 | * | ||
diff --git a/meta/recipes-core/kbd/kbd_2.0.1.bb b/meta/recipes-core/kbd/kbd_2.0.1.bb index d39f4c8f32..b2afc602a1 100644 --- a/meta/recipes-core/kbd/kbd_2.0.1.bb +++ b/meta/recipes-core/kbd/kbd_2.0.1.bb | |||
@@ -10,7 +10,9 @@ RREPLACES_${PN} = "console-tools" | |||
10 | RPROVIDES_${PN} = "console-tools" | 10 | RPROVIDES_${PN} = "console-tools" |
11 | RCONFLICTS_${PN} = "console-tools" | 11 | RCONFLICTS_${PN} = "console-tools" |
12 | 12 | ||
13 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.bz2" | 13 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.bz2 \ |
14 | file://uclibc-stdarg.patch \ | ||
15 | " | ||
14 | 16 | ||
15 | SRC_URI[md5sum] = "f80b93a6abddb6cc2a3652daaf7562ba" | 17 | SRC_URI[md5sum] = "f80b93a6abddb6cc2a3652daaf7562ba" |
16 | SRC_URI[sha256sum] = "223d60bb6882323cca161aeb5965590768b2f590fd7cddbf27511ad0ba7a429e" | 18 | SRC_URI[sha256sum] = "223d60bb6882323cca161aeb5965590768b2f590fd7cddbf27511ad0ba7a429e" |