X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ac874e5fa417691de2eb4c8dcdc88735aa1c7733..e83c4ff72150271fc703f362b0b6acee11d51d8c:/package/linux-atm/patches/200-no_libfl.patch diff --git a/package/linux-atm/patches/200-no_libfl.patch b/package/linux-atm/patches/200-no_libfl.patch index 1b538b2a3..1f7ae028c 100644 --- a/package/linux-atm/patches/200-no_libfl.patch +++ b/package/linux-atm/patches/200-no_libfl.patch @@ -1,6 +1,7 @@ -diff -ruN linux-atm-2.4.1/src/qgen/Makefile.am linux-atm-2.4.1.new/src/qgen/Makefile.am ---- linux-atm-2.4.1/src/qgen/Makefile.am 2001-09-03 20:41:05.000000000 +0200 -+++ linux-atm-2.4.1.new/src/qgen/Makefile.am 2005-07-26 14:49:05.000000000 +0200 +Index: linux-atm-2.4.1/src/qgen/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/Makefile.am 2007-10-20 19:19:10.354218533 +0200 ++++ linux-atm-2.4.1/src/qgen/Makefile.am 2007-10-20 19:19:16.814586679 +0200 @@ -3,7 +3,7 @@ qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \ @@ -10,24 +11,26 @@ diff -ruN linux-atm-2.4.1/src/qgen/Makefile.am linux-atm-2.4.1.new/src/qgen/Make q_dump_SOURCES = common.c q_dump_LDADD = qd.dump.standalone.o -diff -ruN linux-atm-2.4.1/src/qgen/Makefile.in linux-atm-2.4.1.new/src/qgen/Makefile.in ---- linux-atm-2.4.1/src/qgen/Makefile.in 2003-04-30 16:44:01.000000000 +0200 -+++ linux-atm-2.4.1.new/src/qgen/Makefile.in 2005-07-26 14:49:13.000000000 +0200 -@@ -91,7 +91,7 @@ - qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \ - qgen.h second.c third.c +Index: linux-atm-2.4.1/src/qgen/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/Makefile.in 2007-10-20 19:19:11.898306522 +0200 ++++ linux-atm-2.4.1/src/qgen/Makefile.in 2007-10-20 19:19:16.814586679 +0200 +@@ -90,7 +90,7 @@ + + qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c qgen.h second.c third.c -qgen_LDADD = -lfl +qgen_LDADD = q_dump_SOURCES = common.c q_dump_LDADD = qd.dump.standalone.o -diff -ruN linux-atm-2.4.1/src/qgen/ql_l.c linux-atm-2.4.1.new/src/qgen/ql_l.c ---- linux-atm-2.4.1/src/qgen/ql_l.c 2003-04-24 21:46:49.000000000 +0200 -+++ linux-atm-2.4.1.new/src/qgen/ql_l.c 2005-07-26 20:45:40.000000000 +0200 -@@ -11,6 +11,11 @@ - #include - #include +Index: linux-atm-2.4.1/src/qgen/ql_l.c +=================================================================== +--- linux-atm-2.4.1.orig/src/qgen/ql_l.c 2007-10-20 19:19:11.906306980 +0200 ++++ linux-atm-2.4.1/src/qgen/ql_l.c 2007-10-20 19:19:16.842588278 +0200 +@@ -501,6 +501,11 @@ + #include "qgen.h" + #include "ql_y.h" +int yywrap(void) +{ @@ -35,11 +38,12 @@ diff -ruN linux-atm-2.4.1/src/qgen/ql_l.c linux-atm-2.4.1.new/src/qgen/ql_l.c +} + - /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ - #ifdef c_plusplus -diff -ruN linux-atm-2.4.1/src/sigd/cfg_l.c linux-atm-2.4.1.new/src/sigd/cfg_l.c ---- linux-atm-2.4.1/src/sigd/cfg_l.c 2003-04-24 21:47:21.000000000 +0200 -+++ linux-atm-2.4.1.new/src/sigd/cfg_l.c 2005-07-26 22:04:13.000000000 +0200 + typedef struct _tree { + struct _tree *left,*right; +Index: linux-atm-2.4.1/src/sigd/cfg_l.c +=================================================================== +--- linux-atm-2.4.1.orig/src/sigd/cfg_l.c 2007-10-20 19:19:10.378219897 +0200 ++++ linux-atm-2.4.1/src/sigd/cfg_l.c 2007-10-20 19:19:16.854588969 +0200 @@ -11,6 +11,10 @@ #include #include @@ -51,9 +55,10 @@ diff -ruN linux-atm-2.4.1/src/sigd/cfg_l.c linux-atm-2.4.1.new/src/sigd/cfg_l.c /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus -diff -ruN linux-atm-2.4.1/src/sigd/Makefile.am linux-atm-2.4.1.new/src/sigd/Makefile.am ---- linux-atm-2.4.1/src/sigd/Makefile.am 2001-10-04 23:17:26.000000000 +0200 -+++ linux-atm-2.4.1.new/src/sigd/Makefile.am 2005-07-26 14:49:44.000000000 +0200 +Index: linux-atm-2.4.1/src/sigd/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/sigd/Makefile.am 2007-10-20 19:19:10.386220355 +0200 ++++ linux-atm-2.4.1/src/sigd/Makefile.am 2007-10-20 19:19:16.882590565 +0200 @@ -8,7 +8,7 @@ $(top_builddir)/src/qgen/qd.dump.o \ $(top_builddir)/src/lib/libatm.la \ @@ -63,21 +68,23 @@ diff -ruN linux-atm-2.4.1/src/sigd/Makefile.am linux-atm-2.4.1.new/src/sigd/Make atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS) CLEANFILES = mess.c -diff -ruN linux-atm-2.4.1/src/sigd/Makefile.in linux-atm-2.4.1.new/src/sigd/Makefile.in ---- linux-atm-2.4.1/src/sigd/Makefile.in 2003-04-30 16:44:03.000000000 +0200 -+++ linux-atm-2.4.1.new/src/sigd/Makefile.in 2005-07-26 14:49:48.000000000 +0200 -@@ -97,7 +97,7 @@ - $(top_builddir)/src/lib/libatm.la \ - $(top_builddir)/src/saal/libsaal.a +Index: linux-atm-2.4.1/src/sigd/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/sigd/Makefile.in 2007-10-20 19:19:12.018313361 +0200 ++++ linux-atm-2.4.1/src/sigd/Makefile.in 2007-10-20 19:19:16.886590795 +0200 +@@ -92,7 +92,7 @@ + + atmsigd_XTRAS = mess.o $(top_builddir)/src/qgen/q.out.o $(top_builddir)/src/qgen/qd.dump.o $(top_builddir)/src/lib/libatm.la $(top_builddir)/src/saal/libsaal.a -atmsigd_LDADD = $(atmsigd_XTRAS) -lfl +atmsigd_LDADD = $(atmsigd_XTRAS) atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS) CLEANFILES = mess.c -diff -ruN linux-atm-2.4.1/src/switch/debug/debug.c linux-atm-2.4.1.new/src/switch/debug/debug.c ---- linux-atm-2.4.1/src/switch/debug/debug.c 2001-09-03 20:41:06.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/debug/debug.c 2005-07-26 22:06:53.000000000 +0200 +Index: linux-atm-2.4.1/src/switch/debug/debug.c +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/debug/debug.c 2007-10-20 19:19:12.414335932 +0200 ++++ linux-atm-2.4.1/src/switch/debug/debug.c 2007-10-20 19:19:16.894591246 +0200 @@ -20,6 +20,11 @@ #define PRV(call) ((FAB *) (call)->fab) @@ -90,9 +97,10 @@ diff -ruN linux-atm-2.4.1/src/switch/debug/debug.c linux-atm-2.4.1.new/src/switc typedef struct _fab { CALL *next; /* relay.c may not keep track of calls, but WE are */ -diff -ruN linux-atm-2.4.1/src/switch/debug/Makefile.am linux-atm-2.4.1.new/src/switch/debug/Makefile.am ---- linux-atm-2.4.1/src/switch/debug/Makefile.am 2001-10-04 23:17:26.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/debug/Makefile.am 2005-07-26 14:50:03.000000000 +0200 +Index: linux-atm-2.4.1/src/switch/debug/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/debug/Makefile.am 2007-10-20 19:19:10.406221495 +0200 ++++ linux-atm-2.4.1/src/switch/debug/Makefile.am 2007-10-20 19:19:16.906591931 +0200 @@ -5,7 +5,7 @@ sw_debug_SOURCES = debug.c sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \ @@ -102,21 +110,23 @@ diff -ruN linux-atm-2.4.1/src/switch/debug/Makefile.am linux-atm-2.4.1.new/src/s sw_debug_DEPENDENCIES = $(sw_debug_XTRAS) -diff -ruN linux-atm-2.4.1/src/switch/debug/Makefile.in linux-atm-2.4.1.new/src/switch/debug/Makefile.in ---- linux-atm-2.4.1/src/switch/debug/Makefile.in 2003-04-30 16:44:13.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/debug/Makefile.in 2005-07-26 14:50:08.000000000 +0200 -@@ -93,7 +93,7 @@ - sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \ - $(top_builddir)/src/lib/libatm.la +Index: linux-atm-2.4.1/src/switch/debug/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/debug/Makefile.in 2007-10-20 19:19:12.378333877 +0200 ++++ linux-atm-2.4.1/src/switch/debug/Makefile.in 2007-10-20 19:19:16.918592613 +0200 +@@ -92,7 +92,7 @@ + sw_debug_SOURCES = debug.c + sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a $(top_builddir)/src/lib/libatm.la -sw_debug_LDADD = $(sw_debug_XTRAS) -lfl +sw_debug_LDADD = $(sw_debug_XTRAS) sw_debug_DEPENDENCIES = $(sw_debug_XTRAS) -diff -ruN linux-atm-2.4.1/src/switch/tcp/Makefile.am linux-atm-2.4.1.new/src/switch/tcp/Makefile.am ---- linux-atm-2.4.1/src/switch/tcp/Makefile.am 2001-10-04 23:17:27.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/tcp/Makefile.am 2005-07-26 14:50:16.000000000 +0200 +Index: linux-atm-2.4.1/src/switch/tcp/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/tcp/Makefile.am 2007-10-20 19:19:10.422222406 +0200 ++++ linux-atm-2.4.1/src/switch/tcp/Makefile.am 2007-10-20 19:19:16.922592837 +0200 @@ -5,7 +5,7 @@ sw_tcp_SOURCES = tcpsw.c sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \ @@ -126,21 +136,23 @@ diff -ruN linux-atm-2.4.1/src/switch/tcp/Makefile.am linux-atm-2.4.1.new/src/swi sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS) EXTRA_DIST = mkfiles README -diff -ruN linux-atm-2.4.1/src/switch/tcp/Makefile.in linux-atm-2.4.1.new/src/switch/tcp/Makefile.in ---- linux-atm-2.4.1/src/switch/tcp/Makefile.in 2003-04-30 16:44:14.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/tcp/Makefile.in 2005-07-26 14:50:19.000000000 +0200 -@@ -93,7 +93,7 @@ - sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \ - $(top_builddir)/src/lib/libatm.la +Index: linux-atm-2.4.1/src/switch/tcp/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/tcp/Makefile.in 2007-10-20 19:19:12.422336385 +0200 ++++ linux-atm-2.4.1/src/switch/tcp/Makefile.in 2007-10-20 19:19:16.926593064 +0200 +@@ -92,7 +92,7 @@ + sw_tcp_SOURCES = tcpsw.c + sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a $(top_builddir)/src/lib/libatm.la -sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl +sw_tcp_LDADD = $(sw_tcp_XTRAS) sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS) EXTRA_DIST = mkfiles README -diff -ruN linux-atm-2.4.1/src/switch/tcp/tcpsw.c linux-atm-2.4.1.new/src/switch/tcp/tcpsw.c ---- linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2001-09-03 20:41:06.000000000 +0200 -+++ linux-atm-2.4.1.new/src/switch/tcp/tcpsw.c 2005-07-26 22:08:25.000000000 +0200 +Index: linux-atm-2.4.1/src/switch/tcp/tcpsw.c +=================================================================== +--- linux-atm-2.4.1.orig/src/switch/tcp/tcpsw.c 2007-10-20 19:19:12.426336614 +0200 ++++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2007-10-20 19:19:16.954594660 +0200 @@ -35,6 +35,10 @@ #define MAX_PACKET (ATM_MAX_AAL5_PDU+sizeof(struct atmtcp_hdr)) #define BUFFER_SIZE (MAX_PACKET*2) @@ -152,9 +164,10 @@ diff -ruN linux-atm-2.4.1/src/switch/tcp/tcpsw.c linux-atm-2.4.1.new/src/switch/ typedef struct _table { struct _link *out; /* output port */ -diff -ruN linux-atm-2.4.1/src/test/ispl_l.c linux-atm-2.4.1.new/src/test/ispl_l.c ---- linux-atm-2.4.1/src/test/ispl_l.c 2003-04-24 21:46:39.000000000 +0200 -+++ linux-atm-2.4.1.new/src/test/ispl_l.c 2005-07-26 20:45:19.000000000 +0200 +Index: linux-atm-2.4.1/src/test/ispl_l.c +=================================================================== +--- linux-atm-2.4.1.orig/src/test/ispl_l.c 2007-10-20 19:19:10.442223546 +0200 ++++ linux-atm-2.4.1/src/test/ispl_l.c 2007-10-20 19:19:16.962595124 +0200 @@ -11,6 +11,11 @@ #include #include @@ -167,9 +180,10 @@ diff -ruN linux-atm-2.4.1/src/test/ispl_l.c linux-atm-2.4.1.new/src/test/ispl_l. /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ #ifdef c_plusplus -diff -ruN linux-atm-2.4.1/src/test/Makefile.am linux-atm-2.4.1.new/src/test/Makefile.am ---- linux-atm-2.4.1/src/test/Makefile.am 2001-10-04 23:17:27.000000000 +0200 -+++ linux-atm-2.4.1.new/src/test/Makefile.am 2005-07-26 14:49:27.000000000 +0200 +Index: linux-atm-2.4.1/src/test/Makefile.am +=================================================================== +--- linux-atm-2.4.1.orig/src/test/Makefile.am 2007-10-20 19:19:11.858304242 +0200 ++++ linux-atm-2.4.1/src/test/Makefile.am 2007-10-20 19:19:16.962595124 +0200 @@ -15,7 +15,7 @@ bw_SOURCES = bw.c isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l @@ -179,9 +193,10 @@ diff -ruN linux-atm-2.4.1/src/test/Makefile.am linux-atm-2.4.1.new/src/test/Make isp_DEPENDENCIES = $(isp_XTRAS) errnos.inc window_SOURCES = window.c -diff -ruN linux-atm-2.4.1/src/test/Makefile.in linux-atm-2.4.1.new/src/test/Makefile.in ---- linux-atm-2.4.1/src/test/Makefile.in 2003-04-30 16:43:59.000000000 +0200 -+++ linux-atm-2.4.1.new/src/test/Makefile.in 2005-07-26 14:49:32.000000000 +0200 +Index: linux-atm-2.4.1/src/test/Makefile.in +=================================================================== +--- linux-atm-2.4.1.orig/src/test/Makefile.in 2007-10-20 19:19:11.826302420 +0200 ++++ linux-atm-2.4.1/src/test/Makefile.in 2007-10-20 19:19:16.962595124 +0200 @@ -102,7 +102,7 @@ bw_SOURCES = bw.c isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l