patches/uClibc/0.9.30.1/180-getline-conflict.patch
author Zoltan Devai <zdevai@gmail.com>
Wed Oct 28 12:03:38 2009 +0100 (2009-10-28)
branch1.5
changeset 1645 01d01185eb18
permissions -rw-r--r--
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)
     1 --- a/extra/scripts/unifdef.c
     2 +++ b/extra/scripts/unifdef.c
     3 @@ -206,7 +206,7 @@
     4  static void             error(const char *);
     5  static int              findsym(const char *);
     6  static void             flushline(bool);
     7 -static Linetype         getline(void);
     8 +static Linetype         get_line(void);
     9  static Linetype         ifeval(const char **);
    10  static void             ignoreoff(void);
    11  static void             ignoreon(void);
    12 @@ -512,7 +512,7 @@
    13 
    14  	for (;;) {
    15  		linenum++;
    16 -		lineval = getline();
    17 +		lineval = get_line();
    18  		trans_table[ifstate[depth]][lineval]();
    19  		debug("process %s -> %s depth %d",
    20  		    linetype_name[lineval],
    21 @@ -526,7 +526,7 @@
    22   * help from skipcomment().
    23   */
    24  static Linetype
    25 -getline(void)
    26 +get_line(void)
    27  {
    28  	const char *cp;
    29  	int cursym;
    30