[oe-commits] Graeme Gregory : linux-libc-headers_2.6.23.bb : more modern glibc expose getline from

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 9a67b35254b21335d2e5bee6b784b011a79d10ba
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9a67b35254b21335d2e5bee6b784b011a79d10ba

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Tue Apr 28 11:39:38 2009 +0100

linux-libc-headers_2.6.23.bb : more modern glibc expose getline from
stdio.h rename the function so not to cause a clash

---

 recipes/linux-libc-headers/files/unifdef.patch     |   31 ++++++++++++++++++++
 .../linux-libc-headers_2.6.23.bb                   |    5 ++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/recipes/linux-libc-headers/files/unifdef.patch b/recipes/linux-libc-headers/files/unifdef.patch
new file mode 100644
index 0000000..800c3c8
--- /dev/null
+++ b/recipes/linux-libc-headers/files/unifdef.patch
@@ -0,0 +1,31 @@
+Index: linux-2.6.23/scripts/unifdef.c
+===================================================================
+--- linux-2.6.23.orig/scripts/unifdef.c
++++ linux-2.6.23/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/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb
index 13579f9..95152f1 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.23.bb
@@ -2,10 +2,11 @@ require linux-libc-headers.inc
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r3"
+PR = "r4"
 
 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}"