From 3e23549d0aadc710f6d252861b5028f2a6a51b17 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 28 Apr 2009 11:39:38 +0100 Subject: 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 --- .../linux-libc-headers/files/unifdef.patch | 31 ++++++++++++++++++++++ .../linux-libc-headers_2.6.20.bb | 5 ++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 meta/packages/linux-libc-headers/files/unifdef.patch 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 @@ +Index: linux-2.6.20/scripts/unifdef.c +=================================================================== +--- linux-2.6.20.orig/scripts/unifdef.c ++++ linux-2.6.20/scripts/unifdef.c +@@ -206,7 +206,7 @@ static void done(void); + static void error(const char *); + static int findsym(const char *); + static void flushline(bool); +-static Linetype getline(void); ++static Linetype parseline(void); + static Linetype ifeval(const char **); + static void ignoreoff(void); + static void ignoreon(void); +@@ -512,7 +512,7 @@ process(void) + + for (;;) { + linenum++; +- lineval = getline(); ++ lineval = parseline(); + trans_table[ifstate[depth]][lineval](); + debug("process %s -> %s depth %d", + linetype_name[lineval], +@@ -526,7 +526,7 @@ process(void) + * help from skipcomment(). + */ + static Linetype +-getline(void) ++parseline(void) + { + const char *cp; + 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 INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r8" +PR = "r9" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://procinfo.h" + file://procinfo.h \ + file://unifdef.patch;patch=1" S = "${WORKDIR}/linux-${PV}" -- cgit v1.2.3-54-g00ecf