diff options
author | Zoltan Devai <zdevai@gmail.com> | 2009-10-28 11:03:38 (GMT) |
---|---|---|
committer | Zoltan Devai <zdevai@gmail.com> | 2009-10-28 11:03:38 (GMT) |
commit | 0256c1b0cc63f25b9ca2634734538c5f86885b87 (patch) | |
tree | 8f8f8ebe02fc729d91af87599718f5e89cbbeee1 /patches/uClibc/0.9.30.1/180-getline-conflict.patch | |
parent | 6c3a08411ddd2461dfdc8fa039342fd85376d0d0 (diff) |
libc/uClibc: fix building on system with recent glibc
While trying to build a toolchain with ct-ng 1.5.0,
arm-unknown-linux-uclibcgnueabi target,
I get the following error:
[INFO ] Installing C library headers
[EXTRA] Copying sources to build dir
[EXTRA] Applying configuration
[EXTRA] Building headers
[EXTRA] Installing headers
[ERROR] extra/scripts/unifdef.c:209: error: conflicting types for 'getline'
[ERROR] make[2]: *** [extra/scripts/unifdef] Error 1
[ERROR] Build failed in step 'Installing C library headers'
The following patch solves the problem.
(It's a backport of this uClibc commit:
http://git.uclibc.org/uClibc/commit/?id=49e81cada73616864b9b31df0aeb6961c30f5a6e
)
[--SNIP from another mail--]
AFAIK this is a problem since glibc 2.10.
(transplanted from 1ba79f2126df8bd89120899a58f2d0bcc2e9c771)
Diffstat (limited to 'patches/uClibc/0.9.30.1/180-getline-conflict.patch')
-rw-r--r-- | patches/uClibc/0.9.30.1/180-getline-conflict.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/patches/uClibc/0.9.30.1/180-getline-conflict.patch b/patches/uClibc/0.9.30.1/180-getline-conflict.patch new file mode 100644 index 0000000..50842f9 --- /dev/null +++ b/patches/uClibc/0.9.30.1/180-getline-conflict.patch @@ -0,0 +1,30 @@ +--- a/extra/scripts/unifdef.c ++++ b/extra/scripts/unifdef.c +@@ -206,7 +206,7 @@ + static void error(const char *); + static int findsym(const char *); + static void flushline(bool); +-static Linetype getline(void); ++static Linetype get_line(void); + static Linetype ifeval(const char **); + static void ignoreoff(void); + static void ignoreon(void); +@@ -512,7 +512,7 @@ + + for (;;) { + linenum++; +- lineval = getline(); ++ lineval = get_line(); + 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) ++get_line(void) + { + const char *cp; + int cursym; + |