summaryrefslogtreecommitdiff
path: root/recipes/uclibc
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2009-08-09 12:05:39 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2009-08-09 12:11:07 +0200
commitb9d8c34bc09feb72fd4578a0c6afe9bec5adf704 (patch)
tree8bddbbff4e19111a8f4d5f5a1c4ed314d7751355 /recipes/uclibc
parentcb58de6bef73047d3fdf8f58c669137393976091 (diff)
uclibc-initial_0.9.30.1.bb: Fix do_stage for ubuntu karmic
gcc4.4 and glibc 2.10 complain that getline already has a different signature. Rename the version in the unidef.c.
Diffstat (limited to 'recipes/uclibc')
-rw-r--r--recipes/uclibc/uclibc-0.9.30.1/gcc-4.4-fixlet.patch31
-rw-r--r--recipes/uclibc/uclibc_0.9.30.1.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/recipes/uclibc/uclibc-0.9.30.1/gcc-4.4-fixlet.patch b/recipes/uclibc/uclibc-0.9.30.1/gcc-4.4-fixlet.patch
new file mode 100644
index 0000000000..b9ff6710bc
--- /dev/null
+++ b/recipes/uclibc/uclibc-0.9.30.1/gcc-4.4-fixlet.patch
@@ -0,0 +1,31 @@
+Index: uClibc-0.9.30.1/extra/scripts/unifdef.c
+===================================================================
+--- uClibc-0.9.30.1.orig/extra/scripts/unifdef.c 2009-08-09 11:55:23.000000000 +0200
++++ uClibc-0.9.30.1/extra/scripts/unifdef.c 2009-08-09 11:55:46.000000000 +0200
+@@ -206,7 +206,7 @@
+ static void error(const char *);
+ static int findsym(const char *);
+ static void flushline(bool);
+-static Linetype getline(void);
++static Linetype _getline(void);
+ static Linetype ifeval(const char **);
+ static void ignoreoff(void);
+ static void ignoreon(void);
+@@ -512,7 +512,7 @@
+
+ for (;;) {
+ linenum++;
+- lineval = getline();
++ lineval = _getline();
+ trans_table[ifstate[depth]][lineval]();
+ debug("process %s -> %s depth %d",
+ linetype_name[lineval],
+@@ -526,7 +526,7 @@
+ * help from skipcomment().
+ */
+ static Linetype
+-getline(void)
++_getline(void)
+ {
+ const char *cp;
+ int cursym;
diff --git a/recipes/uclibc/uclibc_0.9.30.1.bb b/recipes/uclibc/uclibc_0.9.30.1.bb
index 39d7f52504..5fdf829b60 100644
--- a/recipes/uclibc/uclibc_0.9.30.1.bb
+++ b/recipes/uclibc/uclibc_0.9.30.1.bb
@@ -19,6 +19,7 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \
file://pthread_atfork.patch;patch=1 \
file://uclibc_ldso_use_O0.patch;patch=1 \
file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
+ file://gcc-4.4-fixlet.patch;patch=1 \
"
#recent versions uclibc require real kernel headers
PACKAGE_ARCH = "${MACHINE_ARCH}"