package/linux-atm/patches/200-no_libfl.patch

   1 Index: linux-atm-2.5.1/src/qgen/Makefile.am
   2 ===================================================================
   3 --- linux-atm-2.5.1.orig/src/qgen/Makefile.am   2010-02-27 01:36:10.156687492 +0100
   4 +++ linux-atm-2.5.1/src/qgen/Makefile.am        2010-02-27 01:36:23.388686762 +0100
   5 @@ -2,7 +2,7 @@
   6
   7  qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \
   8                 qgen.h second.c third.c
   9 -qgen_LDADD = -lfl
  10 +qgen_LDADD =
  11
  12  CC = @CC_FOR_BUILD@
  13  CFLAGS = @CFLAGS_FOR_BUILD@
  14 Index: linux-atm-2.5.1/src/qgen/Makefile.in
  15 ===================================================================
  16 --- linux-atm-2.5.1.orig/src/qgen/Makefile.in   2010-02-27 01:36:10.156687492 +0100
  17 +++ linux-atm-2.5.1/src/qgen/Makefile.in        2010-02-27 02:06:38.992684137 +0100
  18 @@ -58,7 +58,7 @@
  19  am__depfiles_maybe = depfiles
  20  am__mv = mv -f
  21  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  22 -       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  23 +       $(AM_CFLAGS) $(CFLAGS)
  24  LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  25         --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  26         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  27 @@ -208,7 +208,7 @@
  28  qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \
  29                 qgen.h second.c third.c
  30
  31 -qgen_LDADD = -lfl
  32 +qgen_LDADD =
  33
  34  #TESTS = $(check_PROGRAMS)
  35  EXTRA_DIST = ql_y.h ql_y.c ql_l.c
  36 Index: linux-atm-2.5.1/src/sigd/Makefile.am
  37 ===================================================================
  38 --- linux-atm-2.5.1.orig/src/sigd/Makefile.am   2010-02-27 01:36:10.160686786 +0100
  39 +++ linux-atm-2.5.1/src/sigd/Makefile.am        2010-02-27 01:36:23.392683892 +0100
  40 @@ -8,7 +8,7 @@
  41                         $(top_builddir)/src/q2931/qd.dump.o \
  42                         $(top_builddir)/src/lib/libatm.la \
  43                         $(top_builddir)/src/saal/libsaal.a
  44 -atmsigd_LDADD = $(atmsigd_XTRAS) -lfl
  45 +atmsigd_LDADD = $(atmsigd_XTRAS)
  46  atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS)
  47
  48  CLEANFILES = mess.c
  49 Index: linux-atm-2.5.1/src/sigd/Makefile.in
  50 ===================================================================
  51 --- linux-atm-2.5.1.orig/src/sigd/Makefile.in   2010-02-27 01:36:10.160686786 +0100
  52 +++ linux-atm-2.5.1/src/sigd/Makefile.in        2010-02-27 01:36:23.396685195 +0100
  53 @@ -244,7 +244,7 @@
  54                         $(top_builddir)/src/lib/libatm.la \
  55                         $(top_builddir)/src/saal/libsaal.a
  56
  57 -atmsigd_LDADD = $(atmsigd_XTRAS) -lfl
  58 +atmsigd_LDADD = $(atmsigd_XTRAS)
  59  atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS)
  60  CLEANFILES = mess.c
  61  sysconf_DATA = atmsigd.conf
  62 Index: linux-atm-2.5.1/src/switch/debug/debug.c
  63 ===================================================================
  64 --- linux-atm-2.5.1.orig/src/switch/debug/debug.c       2010-02-27 01:36:10.160686786 +0100
  65 +++ linux-atm-2.5.1/src/switch/debug/debug.c    2010-02-27 01:36:23.396685195 +0100
  66 @@ -20,6 +20,11 @@
  67
  68  #define PRV(call) ((FAB *) (call)->fab)
  69
  70 +int yywrap(void)
  71 +{
  72 +        return 1;
  73 +}
  74 +
  75
  76  typedef struct _fab {
  77      CALL *next; /* relay.c may not keep track of calls, but WE are */
  78 Index: linux-atm-2.5.1/src/switch/debug/Makefile.am
  79 ===================================================================
  80 --- linux-atm-2.5.1.orig/src/switch/debug/Makefile.am   2010-02-27 01:36:10.164686879 +0100
  81 +++ linux-atm-2.5.1/src/switch/debug/Makefile.am        2010-02-27 01:36:23.396685195 +0100
  82 @@ -5,7 +5,7 @@
  83  sw_debug_SOURCES = debug.c
  84  sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
  85                         $(top_builddir)/src/lib/libatm.la
  86 -sw_debug_LDADD = $(sw_debug_XTRAS) -lfl
  87 +sw_debug_LDADD = $(sw_debug_XTRAS)
  88
  89  sw_debug_DEPENDENCIES = $(sw_debug_XTRAS)
  90
  91 Index: linux-atm-2.5.1/src/switch/debug/Makefile.in
  92 ===================================================================
  93 --- linux-atm-2.5.1.orig/src/switch/debug/Makefile.in   2010-02-27 01:36:10.164686879 +0100
  94 +++ linux-atm-2.5.1/src/switch/debug/Makefile.in        2010-02-27 01:36:23.396685195 +0100
  95 @@ -199,7 +199,8 @@
  96  sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
  97                         $(top_builddir)/src/lib/libatm.la
  98
  99 -sw_debug_LDADD = $(sw_debug_XTRAS) -lfl
 100 +sw_debug_LDADD = $(sw_debug_XTRAS)
 101 +
 102  sw_debug_DEPENDENCIES = $(sw_debug_XTRAS)
 103  EXTRA_DIST = demo README
 104  all: all-am
 105 Index: linux-atm-2.5.1/src/switch/tcp/Makefile.am
 106 ===================================================================
 107 --- linux-atm-2.5.1.orig/src/switch/tcp/Makefile.am     2010-02-27 01:36:10.201682113 +0100
 108 +++ linux-atm-2.5.1/src/switch/tcp/Makefile.am  2010-02-27 01:36:23.412882977 +0100
 109 @@ -5,7 +5,7 @@
 110  sw_tcp_SOURCES = tcpsw.c
 111  sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
 112                 $(top_builddir)/src/lib/libatm.la
 113 -sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl
 114 +sw_tcp_LDADD = $(sw_tcp_XTRAS)
 115  sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
 116
 117  EXTRA_DIST = mkfiles README
 118 Index: linux-atm-2.5.1/src/switch/tcp/Makefile.in
 119 ===================================================================
 120 --- linux-atm-2.5.1.orig/src/switch/tcp/Makefile.in     2010-02-27 01:36:10.209681349 +0100
 121 +++ linux-atm-2.5.1/src/switch/tcp/Makefile.in  2010-02-27 01:36:23.417680887 +0100
 122 @@ -199,7 +199,7 @@
 123  sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
 124                 $(top_builddir)/src/lib/libatm.la
 125
 126 -sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl
 127 +sw_tcp_LDADD = $(sw_tcp_XTRAS)
 128  sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
 129  EXTRA_DIST = mkfiles README
 130  all: all-am
 131 Index: linux-atm-2.5.1/src/switch/tcp/tcpsw.c
 132 ===================================================================
 133 --- linux-atm-2.5.1.orig/src/switch/tcp/tcpsw.c 2010-02-27 01:36:10.221684444 +0100
 134 +++ linux-atm-2.5.1/src/switch/tcp/tcpsw.c      2010-02-27 01:36:23.428680415 +0100
 135 @@ -35,6 +35,10 @@
 136  #define MAX_PACKET (ATM_MAX_AAL5_PDU+sizeof(struct atmtcp_hdr))
 137  #define BUFFER_SIZE (MAX_PACKET*2)
 138
 139 +int yywrap(void)
 140 +{
 141 +        return 1;
 142 +}
 143
 144  typedef struct _table {
 145      struct _link *out; /* output port */
 146 Index: linux-atm-2.5.1/src/test/Makefile.am
 147 ===================================================================
 148 --- linux-atm-2.5.1.orig/src/test/Makefile.am   2010-02-27 01:36:10.221684444 +0100
 149 +++ linux-atm-2.5.1/src/test/Makefile.am        2010-02-27 01:36:23.428680415 +0100
 150 @@ -20,7 +20,7 @@
 151  bw_SOURCES = bw.c
 152  isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l
 153  isp_XTRAS = $(LDADD)
 154 -isp_LDADD = $(isp_XTRAS) -lfl
 155 +isp_LDADD = $(isp_XTRAS)
 156  isp_DEPENDENCIES = $(isp_XTRAS)
 157  window_SOURCES = window.c
 158
 159 Index: linux-atm-2.5.1/src/test/Makefile.in
 160 ===================================================================
 161 --- linux-atm-2.5.1.orig/src/test/Makefile.in   2010-02-27 01:36:10.225688778 +0100
 162 +++ linux-atm-2.5.1/src/test/Makefile.in        2010-02-27 01:36:23.432685583 +0100
 163 @@ -282,7 +282,7 @@
 164  bw_SOURCES = bw.c
 165  isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l
 166  isp_XTRAS = $(LDADD)
 167 -isp_LDADD = $(isp_XTRAS) -lfl
 168 +isp_LDADD = $(isp_XTRAS)
 169  isp_DEPENDENCIES = $(isp_XTRAS)
 170  window_SOURCES = window.c
 171  CLEANFILES = errnos.inc
 172
 173 Index: linux-atm-2.5.1/src/test/ispl_l.l
 174 ===================================================================
 175 --- linux-atm-2.5.1/src/test/ispl_l.l-orig      2010-03-15 10:52:39.000000000 -0500
 176 +++ linux-atm-2.5.1/src/test/ispl_l.l   2010-03-15 10:54:45.000000000 -0500
 177 @@ -17,6 +17,11 @@
 178  #include "isp.h"
 179  #include "ispl_y.h"
 180
 181 +int yywrap(void)
 182 +{
 183 +       return 1;
 184 +}
 185 +
 186  static int lineno = 1;
 187
 188  %}
 189 Index: linux-atm-2.5.1/src/qgen/ql_l.l
 190 ===================================================================
 191 --- linux-atm-2.5.1/src/qgen/ql_l.l.orig        2010-03-15 11:07:01.000000000 -0500
 192 +++ linux-atm-2.5.1/src/qgen/ql_l.l     2010-03-15 11:06:04.000000000 -0500
 193 @@ -10,6 +10,11 @@
 194  #include "qgen.h"
 195  #include "ql_y.h"
 196
 197 +int yywrap(void)
 198 +{
 199 +        return 1;
 200 +}
 201 +
 202  typedef struct _tree {
 203      struct _tree *left,*right;
 204      const char str[0];
 205
 206 Index: linux-atm-2.5.1/src/sigd/cfg_l.l
 207 ===================================================================
 208 --- linux-atm-2.5.1/src/sigd/cfg_l.l-orig       2010-03-15 11:12:39.000000000 -0500
 209 +++ linux-atm-2.5.1/src/sigd/cfg_l.l    2010-03-15 11:13:22.000000000 -0500
 210 @@ -16,6 +16,10 @@
 211
 212  #include "cfg_y.h"
 213
 214 +int yywrap(void)
 215 +{
 216 +        return 1;
 217 +}
 218
 219  static int lineno = 1;
 220  static int token; /* f@#%ing flex doesn't grok return after BEGIN */