From 9b0290ffbd16d324fc195d039727c3920829b9f6 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Tue, 24 Mar 2020 09:51:36 +0000 Subject: [PATCH 1/2] nftables: bump to 0.9.3 Signed-off-by: Kevin Darbyshire-Bryant --- package/network/utils/nftables/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile index 68e712bb59..3c9c827a99 100644 --- a/package/network/utils/nftables/Makefile +++ b/package/network/utils/nftables/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nftables -PKG_VERSION:=0.9.2 +PKG_VERSION:=0.9.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files -PKG_HASH:=5cb66180143e6bfc774f4eb316206d40ac1cb6df269a90882404cbf7165513f5 +PKG_HASH:=956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78 PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0 From 1fb3c003d68d3feaf797e8b64edccc9fa622d250 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Tue, 24 Mar 2020 11:05:27 +0000 Subject: [PATCH 2/2] build: prereq: tidy gcc version checks There is a restriction in the number of parameters(10) that may be passed to the SetupHostCommand macro so continually adding explicit gcc'n' version checks ends up breaking the compiler check for the later versions and oddballs like Darwin as was done in 835d1c68a0 which added gcc10. Drop all the explicitly specified gcc version checks. If a suitable gcc compiler is not found, it may be specified at the dependency checking stage after which that version will be symlinked into the build staging host directory. eg. 'CC=gccfoo CXX=g++foo make prereq' Signed-off-by: Kevin Darbyshire-Bryant Acked-by: Jo-Philipp Wich --- include/prereq-build.mk | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 156b3f3722..830a9eff9a 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -30,14 +30,6 @@ $(eval $(call SetupHostCommand,gcc, \ Please install the GNU C Compiler (gcc) 4.8 or later, \ $(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ gcc -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ - gcc48 --version | grep gcc, \ - gcc49 --version | grep gcc, \ - gcc5 --version | grep gcc, \ - gcc6 --version | grep gcc, \ - gcc7 --version | grep gcc, \ - gcc8 --version | grep gcc, \ - gcc9 --version | grep gcc, \ - gcc10 --version | grep gcc, \ gcc --version | grep -E 'Apple.(LLVM|clang)' )) $(eval $(call TestHostCommand,working-gcc, \ @@ -50,14 +42,6 @@ $(eval $(call SetupHostCommand,g++, \ Please install the GNU C++ Compiler (g++) 4.8 or later, \ $(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ g++ -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ - g++48 --version | grep g++, \ - g++49 --version | grep g++, \ - g++5 --version | grep g++, \ - g++6 --version | grep g++, \ - g++7 --version | grep g++, \ - g++8 --version | grep g++, \ - g++9 --version | grep g++, \ - g++10 --version | grep g++, \ g++ --version | grep -E 'Apple.(LLVM|clang)' )) $(eval $(call TestHostCommand,working-g++, \