patches/uClibc/0.9.30.1/180-getline-conflict.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Tue Mar 11 22:11:43 2014 +0100 (2014-03-11)
changeset 3293 e11a8a2e225d
permissions -rw-r--r--
comptools: do not force build of make-3.81 unless really needed

On systems with make-3.82, we forcibly force the build and the use
of make-3.81

But some newer tools break when building with make-3.81. For example,
eglibc-3.18 breaks.

Introduce a new blind options that tools may select if they require
make-3.81. If the system does not have make-3.81, and this option is
selected, then we force the build of make-3.81. Otherwise, we leave
it to the user to decide on his own.

Note that no component selects this option for now. It will come in
later patches as we find them.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
zdevai@1602
     1
--- a/extra/scripts/unifdef.c
zdevai@1602
     2
+++ b/extra/scripts/unifdef.c
zdevai@1602
     3
@@ -206,7 +206,7 @@
zdevai@1602
     4
 static void             error(const char *);
zdevai@1602
     5
 static int              findsym(const char *);
zdevai@1602
     6
 static void             flushline(bool);
zdevai@1602
     7
-static Linetype         getline(void);
zdevai@1602
     8
+static Linetype         get_line(void);
zdevai@1602
     9
 static Linetype         ifeval(const char **);
zdevai@1602
    10
 static void             ignoreoff(void);
zdevai@1602
    11
 static void             ignoreon(void);
zdevai@1602
    12
@@ -512,7 +512,7 @@
zdevai@1602
    13
zdevai@1602
    14
 	for (;;) {
zdevai@1602
    15
 		linenum++;
zdevai@1602
    16
-		lineval = getline();
zdevai@1602
    17
+		lineval = get_line();
zdevai@1602
    18
 		trans_table[ifstate[depth]][lineval]();
zdevai@1602
    19
 		debug("process %s -> %s depth %d",
zdevai@1602
    20
 		    linetype_name[lineval],
zdevai@1602
    21
@@ -526,7 +526,7 @@
zdevai@1602
    22
  * help from skipcomment().
zdevai@1602
    23
  */
zdevai@1602
    24
 static Linetype
zdevai@1602
    25
-getline(void)
zdevai@1602
    26
+get_line(void)
zdevai@1602
    27
 {
zdevai@1602
    28
 	const char *cp;
zdevai@1602
    29
 	int cursym;
zdevai@1602
    30