From 13c83f11e5b2aa5791d59346fb4ebf13e5a8fc60 Mon Sep 17 00:00:00 2001 From: Lucian Cristian Date: Tue, 8 Sep 2020 23:04:57 +0300 Subject: [PATCH] frr: fix running on mips (again) add mips fix missed on version upgrade Signed-off-by: Lucian Cristian --- net/frr/Makefile | 2 +- net/frr/patches/098-fix_mips_libyang.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 net/frr/patches/098-fix_mips_libyang.patch diff --git a/net/frr/Makefile b/net/frr/Makefile index c85a3200c6..68e5171a04 100644 --- a/net/frr/Makefile +++ b/net/frr/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=frr PKG_VERSION:=7.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_URL:=https://github.com/FRRouting/frr/archive/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/net/frr/patches/098-fix_mips_libyang.patch b/net/frr/patches/098-fix_mips_libyang.patch new file mode 100644 index 0000000000..3785cfef3e --- /dev/null +++ b/net/frr/patches/098-fix_mips_libyang.patch @@ -0,0 +1,14 @@ +--- a/lib/northbound.h ++++ b/lib/northbound.h +@@ -504,11 +504,7 @@ struct frr_yang_module_info { + + /* Priority - lower priorities are processed first. */ + uint32_t priority; +-#if defined(__GNUC__) && ((__GNUC__ - 0) < 5) && !defined(__clang__) + } nodes[YANG_MODULE_MAX_NODES + 1]; +-#else +- } nodes[]; +-#endif + }; + + /* Northbound error codes. */