diff options
| author | John Crispin <john@openwrt.org> | 2011-01-22 22:44:58 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2011-01-22 22:44:58 +0000 |
| commit | deb9a1f3e7aecbc0a237df3a432c164affef261f (patch) | |
| tree | fd4e22e2d243bea8cc6744e831fb90f431ae80ce | |
| parent | 079ba5ac140af300db24bc7124543aa2ad9c6f62 (diff) | |
| download | upstream-deb9a1f3e7aecbc0a237df3a432c164affef261f.tar.gz upstream-deb9a1f3e7aecbc0a237df3a432c164affef261f.tar.bz2 upstream-deb9a1f3e7aecbc0a237df3a432c164affef261f.zip | |
* bump to 2.5.2
SVN-Revision: 25067
| -rw-r--r-- | package/linux-atm/Makefile | 8 | ||||
| -rw-r--r-- | package/linux-atm/patches/200-no_libfl.patch | 29 |
2 files changed, 14 insertions, 23 deletions
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 4b12af9b17..39db05ef9f 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=linux-atm -PKG_VERSION:=2.5.1 +PKG_VERSION:=2.5.2 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz -PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/ -PKG_MD5SUM:=9560b0e1f410a05b849dfdab465dd758 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/$(PKG_NAME) +PKG_MD5SUM:=d49499368c3cf15f73a05d9bce8824a8 PKG_INSTALL:=1 diff --git a/package/linux-atm/patches/200-no_libfl.patch b/package/linux-atm/patches/200-no_libfl.patch index 4a95c9ae2d..6db877931f 100644 --- a/package/linux-atm/patches/200-no_libfl.patch +++ b/package/linux-atm/patches/200-no_libfl.patch @@ -7,28 +7,19 @@ -qgen_LDADD = -lfl +qgen_LDADD = - CC = @CC_FOR_BUILD@ - CFLAGS = @CFLAGS_FOR_BUILD@ + COMPILE = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@ + LINK = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@ -o $@ --- a/src/qgen/Makefile.in +++ b/src/qgen/Makefile.in -@@ -58,7 +58,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -@@ -208,7 +208,7 @@ top_srcdir = @top_srcdir@ +@@ -204,7 +204,7 @@ top_srcdir = @top_srcdir@ 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 = ++qgen_LDADD = + COMPILE = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@ + LINK = @CC_FOR_BUILD@ @CFLAGS_FOR_BUILD@ -o $@ - #TESTS = $(check_PROGRAMS) - EXTRA_DIST = ql_y.h ql_y.c ql_l.c --- a/src/sigd/Makefile.am +++ b/src/sigd/Makefile.am @@ -8,7 +8,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s @@ -42,7 +33,7 @@ CLEANFILES = mess.c --- a/src/sigd/Makefile.in +++ b/src/sigd/Makefile.in -@@ -244,7 +244,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s +@@ -245,7 +245,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s $(top_builddir)/src/lib/libatm.la \ $(top_builddir)/src/saal/libsaal.a @@ -78,7 +69,7 @@ --- a/src/switch/debug/Makefile.in +++ b/src/switch/debug/Makefile.in -@@ -199,7 +199,8 @@ sw_debug_SOURCES = debug.c +@@ -200,7 +200,8 @@ sw_debug_SOURCES = debug.c sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \ $(top_builddir)/src/lib/libatm.la @@ -101,7 +92,7 @@ EXTRA_DIST = mkfiles README --- a/src/switch/tcp/Makefile.in +++ b/src/switch/tcp/Makefile.in -@@ -199,7 +199,7 @@ sw_tcp_SOURCES = tcpsw.c +@@ -200,7 +200,7 @@ sw_tcp_SOURCES = tcpsw.c sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \ $(top_builddir)/src/lib/libatm.la @@ -136,7 +127,7 @@ --- a/src/test/Makefile.in +++ b/src/test/Makefile.in -@@ -282,7 +282,7 @@ br_SOURCES = br.c +@@ -283,7 +283,7 @@ br_SOURCES = br.c bw_SOURCES = bw.c isp_SOURCES = isp.c isp.h ispl_y.y ispl_l.l isp_XTRAS = $(LDADD) |