From 7e92a1a6f8c22847129fd2b231d7d8acd560ad77 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Sep 2020 17:38:29 +0200 Subject: linnux-atm: update to 2.5.2 --- package/linux-atm/Makefile | 10 +++--- package/linux-atm/patches/patch-ltmain_sh | 11 ------ package/linux-atm/patches/patch-src_Makefile_in | 8 ++--- .../linux-atm/patches/patch-src_qgen_Makefile_in | 40 ---------------------- .../linux-atm/patches/patch-src_sigd_Makefile_in | 6 ++-- .../linux-atm/patches/patch-src_switch_Makefile_in | 6 ++-- .../patches/patch-src_switch_debug_Makefile_in | 6 ++-- .../patches/patch-src_switch_tcp_Makefile_in | 6 ++-- 8 files changed, 20 insertions(+), 73 deletions(-) delete mode 100644 package/linux-atm/patches/patch-ltmain_sh delete mode 100644 package/linux-atm/patches/patch-src_qgen_Makefile_in diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index f2c1ed82e..276b63eaa 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= linux-atm -PKG_VERSION:= 2.5.1 -PKG_RELEASE:= 3 -PKG_HASH:= 6bc60fe53c9e9c828a6d7f3675da11ad7fb54491863584e01c1051740fe2a286 +PKG_VERSION:= 2.5.2 +PKG_RELEASE:= 1 +PKG_HASH:= 9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a PKG_DESCR:= atm library PKG_SECTION:= libs/net PKG_BUILDDEP:= flex-host bison-host @@ -16,15 +16,13 @@ PKG_NOPARALLEL:= 1 PKG_LIBNAME:= libatm PKG_OPTS:= dev -PKG_HOST_DEPENDS:= !freebsd +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SUBPKGS:= LIBATM BR2684CTL PKGSD_BR2684CTL:= br2684ctl ATM utility PKGSS_BR2684CTL:= libatm PKGSC_BR2684CTL:= net/route -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tgz - include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/linux-atm/patches/patch-ltmain_sh b/package/linux-atm/patches/patch-ltmain_sh deleted file mode 100644 index 583f17839..000000000 --- a/package/linux-atm/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-atm-2.5.1.orig/ltmain.sh 2008-08-30 00:27:10.000000000 +0200 -+++ linux-atm-2.5.1/ltmain.sh 2011-01-15 21:47:10.000000000 +0100 -@@ -1676,7 +1676,7 @@ EOF - # -F/path gives path to uninstalled frameworks, gcc on darwin - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. diff --git a/package/linux-atm/patches/patch-src_Makefile_in b/package/linux-atm/patches/patch-src_Makefile_in index 843577f7f..17a162daa 100644 --- a/package/linux-atm/patches/patch-src_Makefile_in +++ b/package/linux-atm/patches/patch-src_Makefile_in @@ -1,11 +1,11 @@ ---- linux-atm-2.5.1.orig/src/Makefile.in 2009-11-30 17:21:16.000000000 +0100 -+++ linux-atm-2.5.1/src/Makefile.in 2009-12-17 16:12:07.284420844 +0100 -@@ -214,7 +214,7 @@ target_vendor = @target_vendor@ +--- linux-atm-2.5.2.orig/src/Makefile.in 2010-12-28 17:06:09.000000000 +0100 ++++ linux-atm-2.5.2/src/Makefile.in 2020-09-14 15:27:36.454621754 +0200 +@@ -215,7 +215,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = include lib test debug qgen q2931 saal sigd maint arpd ilmid man led lane \ -+SUBDIRS = include lib debug qgen q2931 saal sigd maint arpd ilmid man led lane \ ++SUBDIRS = include lib debug qgen q2931 saal sigd ilmid led lane \ mpoad oamd switch config extra br2684 all: all-recursive diff --git a/package/linux-atm/patches/patch-src_qgen_Makefile_in b/package/linux-atm/patches/patch-src_qgen_Makefile_in deleted file mode 100644 index 9ed7ec3de..000000000 --- a/package/linux-atm/patches/patch-src_qgen_Makefile_in +++ /dev/null @@ -1,40 +0,0 @@ ---- linux-atm-2.5.1.orig/src/qgen/Makefile.in 2009-11-30 17:21:18.000000000 +0100 -+++ linux-atm-2.5.1/src/qgen/Makefile.in 2014-02-07 21:40:48.000000000 +0100 -@@ -57,15 +57,15 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f --COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ --mode=compile $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -- $(LDFLAGS) -o $@ -+ --mode=link $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) \ -+ $(LDFLAGS_FOR_BUILD) -o $@ - LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS) - LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(LEX) $(LFLAGS) $(AM_LFLAGS) -@@ -91,7 +91,7 @@ CC_FOR_BUILD = @CC_FOR_BUILD@ - CFLAGS = @CFLAGS_FOR_BUILD@ - CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ - CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ -@@ -114,7 +114,7 @@ INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = - LEX = @LEX@ - LEXLIB = @LEXLIB@ - LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ diff --git a/package/linux-atm/patches/patch-src_sigd_Makefile_in b/package/linux-atm/patches/patch-src_sigd_Makefile_in index faa5a1385..62f0e5424 100644 --- a/package/linux-atm/patches/patch-src_sigd_Makefile_in +++ b/package/linux-atm/patches/patch-src_sigd_Makefile_in @@ -1,6 +1,6 @@ ---- linux-atm-2.5.1.orig/src/sigd/Makefile.in 2009-11-30 17:21:19.000000000 +0100 -+++ linux-atm-2.5.1/src/sigd/Makefile.in 2009-12-17 16:21:42.636433571 +0100 -@@ -244,7 +244,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s +--- linux-atm-2.5.2.orig/src/sigd/Makefile.in 2010-12-28 17:06:11.000000000 +0100 ++++ linux-atm-2.5.2/src/sigd/Makefile.in 2020-09-14 15:22:00.557233015 +0200 +@@ -245,7 +245,7 @@ atmsigd_XTRAS = mess.o $(top_builddir)/s $(top_builddir)/src/lib/libatm.la \ $(top_builddir)/src/saal/libsaal.a diff --git a/package/linux-atm/patches/patch-src_switch_Makefile_in b/package/linux-atm/patches/patch-src_switch_Makefile_in index 4a2981839..0aabc8b69 100644 --- a/package/linux-atm/patches/patch-src_switch_Makefile_in +++ b/package/linux-atm/patches/patch-src_switch_Makefile_in @@ -1,6 +1,6 @@ ---- linux-atm-2.5.1.orig/src/switch/Makefile.in 2009-11-30 17:21:19.000000000 +0100 -+++ linux-atm-2.5.1/src/switch/Makefile.in 2009-12-17 16:30:47.392542123 +0100 -@@ -249,7 +249,7 @@ target_vendor = @target_vendor@ +--- linux-atm-2.5.2.orig/src/switch/Makefile.in 2010-12-28 17:06:11.000000000 +0100 ++++ linux-atm-2.5.2/src/switch/Makefile.in 2020-09-14 15:22:00.585234798 +0200 +@@ -250,7 +250,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ diff --git a/package/linux-atm/patches/patch-src_switch_debug_Makefile_in b/package/linux-atm/patches/patch-src_switch_debug_Makefile_in index 2d8fa57d2..b7e08da25 100644 --- a/package/linux-atm/patches/patch-src_switch_debug_Makefile_in +++ b/package/linux-atm/patches/patch-src_switch_debug_Makefile_in @@ -1,6 +1,6 @@ ---- linux-atm-2.5.1.orig/src/switch/debug/Makefile.in 2009-11-30 17:21:19.000000000 +0100 -+++ linux-atm-2.5.1/src/switch/debug/Makefile.in 2009-12-17 16:28:31.520542232 +0100 -@@ -199,7 +199,7 @@ sw_debug_SOURCES = debug.c +--- linux-atm-2.5.2.orig/src/switch/debug/Makefile.in 2010-12-28 17:06:11.000000000 +0100 ++++ linux-atm-2.5.2/src/switch/debug/Makefile.in 2020-09-14 15:22:00.573234034 +0200 +@@ -200,7 +200,7 @@ sw_debug_SOURCES = debug.c sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \ $(top_builddir)/src/lib/libatm.la diff --git a/package/linux-atm/patches/patch-src_switch_tcp_Makefile_in b/package/linux-atm/patches/patch-src_switch_tcp_Makefile_in index f23a64405..04113eee1 100644 --- a/package/linux-atm/patches/patch-src_switch_tcp_Makefile_in +++ b/package/linux-atm/patches/patch-src_switch_tcp_Makefile_in @@ -1,6 +1,6 @@ ---- linux-atm-2.5.1.orig/src/switch/tcp/Makefile.in 2009-11-30 17:21:19.000000000 +0100 -+++ linux-atm-2.5.1/src/switch/tcp/Makefile.in 2009-12-17 16:33:08.832418828 +0100 -@@ -199,7 +199,7 @@ sw_tcp_SOURCES = tcpsw.c +--- linux-atm-2.5.2.orig/src/switch/tcp/Makefile.in 2010-12-28 17:06:11.000000000 +0100 ++++ linux-atm-2.5.2/src/switch/tcp/Makefile.in 2020-09-14 15:22:00.593235307 +0200 +@@ -200,7 +200,7 @@ sw_tcp_SOURCES = tcpsw.c sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \ $(top_builddir)/src/lib/libatm.la -- cgit v1.2.3