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