From 7ca6e2827f5eb1c8c810fab57630fdfb62cc9e2b Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 6 Jun 2021 12:45:16 +0200 Subject: [PATCH] olsrd: only compile pud for musl Compiling pud on glibc results in errors. Do not compile it util it is fixed upstream. Signed-off-by: Nick Hainke --- olsrd/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/olsrd/Makefile b/olsrd/Makefile index 9a68041..04d623d 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -36,7 +36,7 @@ endef define Package/olsrd $(call Package/olsrd/template) MENU:=1 - DEPENDS:=+libpthread + DEPENDS:=+libpthread +libgps endef define Package/olsrd/conffiles @@ -118,7 +118,7 @@ endef define Package/olsrd-mod-pud $(call Package/olsrd/template) - DEPENDS:=olsrd +libgps + DEPENDS:=olsrd TITLE:=Position Update Distribution plugin endef @@ -170,7 +170,7 @@ MAKE_FLAGS+= \ DESTDIR="$(PKG_INSTALL_DIR)" \ STRIP="true" \ INSTALL_LIB="true" \ - SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo netjson mdns nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog" + SUBDIRS="arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo netjson mdns nameservice p2pd pgraph quagga secure sgwdynspeed txtinfo watchdog $(if $(CONFIG_USE_MUSL),pud)" define Build/Compile $(call Build/Compile/Default,all) @@ -303,7 +303,9 @@ $(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)) -- 2.30.2