From f024cc177ed234607265ffecdf42bee248579880 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Mon, 7 Jun 2021 19:27:54 +0200 Subject: [PATCH] olsrd: fix glibc --- olsrd/Makefile | 4 +--- olsrd/patches/001-fix-glibc.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 olsrd/patches/001-fix-glibc.patch diff --git a/olsrd/Makefile b/olsrd/Makefile index da14622..11fa751 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -177,7 +177,7 @@ MAKE_FLAGS+= \ DESTDIR="$(PKG_INSTALL_DIR)" \ STRIP="true" \ INSTALL_LIB="true" \ - SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo filtergw jsoninfo netjson mdns nameservice p2pd pgraph quagga secure sgwdynspeed txtinfo watchdog $(if $(CONFIG_USE_MUSL),pud)" + SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo filtergw jsoninfo netjson mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog" define Build/Compile $(call Build/Compile/Default,all) @@ -316,9 +316,7 @@ $(eval $(call BuildPackage,olsrd-mod-mdns)) $(eval $(call BuildPackage,olsrd-mod-nameservice)) $(eval $(call BuildPackage,olsrd-mod-p2pd)) $(eval $(call BuildPackage,olsrd-mod-pgraph)) -ifeq ($(CONFIG_USE_MUSL),y) $(eval $(call BuildPackage,olsrd-mod-pud)) -endif $(eval $(call BuildPackage,olsrd-mod-quagga)) $(eval $(call BuildPackage,olsrd-mod-secure)) $(eval $(call BuildPackage,olsrd-mod-sgwdynspeed)) diff --git a/olsrd/patches/001-fix-glibc.patch b/olsrd/patches/001-fix-glibc.patch new file mode 100644 index 0000000..88e4205 --- /dev/null +++ b/olsrd/patches/001-fix-glibc.patch @@ -0,0 +1,11 @@ +--- a/lib/pud/nmealib/Makefile.inc ++++ b/lib/pud/nmealib/Makefile.inc +@@ -68,7 +68,7 @@ COMMONCFLAGS += -Wall -Wextra -Wold-styl + -Wunused-parameter + + GCCCFLAGS += $(COMMONCFLAGS) -fearly-inlining -finline-functions-called-once -finline-limit=350 -Wtrampolines \ +- -Wsync-nand -Wlogical-op -Wjump-misses-init -Werror ++ -Wsync-nand -Wlogical-op -Wjump-misses-init + + ifeq "$(GCCVERSIONGTEQ6)" "1" + GCCCFLAGS += -Wnull-dereference -Wshift-negative-value -Wshift-overflow -Wtautological-compare