From 234cc2d061f5e16791ac7406c59452a7c9315906 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 29 Jun 2020 16:09:13 -0700 Subject: [PATCH] bandwidthd: fix compilation with GCC10 Added PKG_BUILD_PARALLEL for faster compilation. Fixed license information. Signed-off-by: Rosen Penev --- utils/bandwidthd/Makefile | 6 +++--- utils/bandwidthd/patches/030-gcc10.patch | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 utils/bandwidthd/patches/030-gcc10.patch diff --git a/utils/bandwidthd/Makefile b/utils/bandwidthd/Makefile index 7f72018ebb..6e3344c3a2 100644 --- a/utils/bandwidthd/Makefile +++ b/utils/bandwidthd/Makefile @@ -9,17 +9,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bandwidthd PKG_VERSION:=2.0.1-35 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/NethServer/bandwidthd/tar.gz/$(PKG_VERSION)? PKG_HASH:=75f526d9e81c5a543accbb9e197b6b582c293aa20d6cdfc8be5cef43046981c5 PKG_MAINTAINER:=Jean-Michel Lacroix - -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=GPL-2.0-or-later PKG_FIXUP:=autoreconf +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/utils/bandwidthd/patches/030-gcc10.patch b/utils/bandwidthd/patches/030-gcc10.patch new file mode 100644 index 0000000000..04d3ce0e9e --- /dev/null +++ b/utils/bandwidthd/patches/030-gcc10.patch @@ -0,0 +1,20 @@ +--- a/bandwidthd.h ++++ b/bandwidthd.h +@@ -120,7 +120,7 @@ struct config + char *sensor_id; + }; + +-struct SubnetData ++extern struct SubnetData + { + uint32_t ip; + uint32_t mask; +@@ -139,7 +139,7 @@ struct Statistics + unsigned long long p2p; + }; + +-struct IPData ++extern struct IPData + { + time_t timestamp; + uint32_t ip; // Host byte order -- 2.30.2