summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraeme Gregory <dp@xora.org.uk>2009-04-28 11:39:38 +0100
committerMarcin Juszkiewicz <marcin@buglabs.net>2009-10-22 14:49:29 +0200
commit3e23549d0aadc710f6d252861b5028f2a6a51b17 (patch)
treeb580fe84a7c54ea5c30738bd983b84c186ccace8
parent23212b4c3d9a00a4d6ac695e4115a3bb92aee4eb (diff)
downloadpoky-3e23549d0aadc710f6d252861b5028f2a6a51b17.tar.gz
linux-libc-headers_2.6.20.bb : more modern glibc expose getline from stdio.h rename the function so not to cause a clash
Signed-off-by: Marcin Juszkiewicz <marcin@buglabs.net>
-rw-r--r--meta/packages/linux-libc-headers/files/unifdef.patch31
-rw-r--r--meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb5
2 files changed, 34 insertions, 2 deletions
diff --git a/meta/packages/linux-libc-headers/files/unifdef.patch b/meta/packages/linux-libc-headers/files/unifdef.patch
new file mode 100644
index 0000000000..bda8860009
--- /dev/null
+++ b/meta/packages/linux-libc-headers/files/unifdef.patch
@@ -0,0 +1,31 @@
1Index: linux-2.6.20/scripts/unifdef.c
2===================================================================
3--- linux-2.6.20.orig/scripts/unifdef.c
4+++ linux-2.6.20/scripts/unifdef.c
5@@ -206,7 +206,7 @@ static void done(void);
6 static void error(const char *);
7 static int findsym(const char *);
8 static void flushline(bool);
9-static Linetype getline(void);
10+static Linetype parseline(void);
11 static Linetype ifeval(const char **);
12 static void ignoreoff(void);
13 static void ignoreon(void);
14@@ -512,7 +512,7 @@ process(void)
15
16 for (;;) {
17 linenum++;
18- lineval = getline();
19+ lineval = parseline();
20 trans_table[ifstate[depth]][lineval]();
21 debug("process %s -> %s depth %d",
22 linetype_name[lineval],
23@@ -526,7 +526,7 @@ process(void)
24 * help from skipcomment().
25 */
26 static Linetype
27-getline(void)
28+parseline(void)
29 {
30 const char *cp;
31 int cursym;
diff --git a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
index c857336118..9ade91ca4b 100644
--- a/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
+++ b/meta/packages/linux-libc-headers/linux-libc-headers_2.6.20.bb
@@ -2,10 +2,11 @@ require linux-libc-headers.inc
2 2
3INHIBIT_DEFAULT_DEPS = "1" 3INHIBIT_DEFAULT_DEPS = "1"
4DEPENDS += "unifdef-native" 4DEPENDS += "unifdef-native"
5PR = "r8" 5PR = "r9"
6 6
7SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ 7SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
8 file://procinfo.h" 8 file://procinfo.h \
9 file://unifdef.patch;patch=1"
9 10
10S = "${WORKDIR}/linux-${PV}" 11S = "${WORKDIR}/linux-${PV}"
11 12