From: Guilherme Janczak Date: Mon, 9 May 2022 13:10:25 +0000 (+0000) Subject: lldpd: always depend on libbsd X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=d0e9603dc27ed6b792b37761f1433f12e51fa2be;p=openwrt%2Fstaging%2Fchunkeey.git lldpd: always depend on libbsd lldpd calls setproctitle() and strtonum(); its configure.ac script has fallbacks for when they're not found, but they should come from libbsd instead. Signed-off-by: Guilherme Janczak --- diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile index 8eb7e35716..ba1da1f9e8 100644 --- a/package/network/services/lldpd/Makefile +++ b/package/network/services/lldpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lldpd PKG_VERSION:=1.0.13 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://media.luffy.cx/files/lldpd @@ -30,7 +30,7 @@ define Package/lldpd SUBMENU:=Routing and Redirection TITLE:=Link Layer Discovery Protocol daemon URL:=https://vincentbernat.github.io/lldpd/ - DEPENDS:=+libcap +libevent2 +USE_GLIBC:libbsd +LLDPD_WITH_JSON:libjson-c +LLDPD_WITH_SNMP:libnetsnmp + DEPENDS:=+libcap +libevent2 +libbsd +LLDPD_WITH_JSON:libjson-c +LLDPD_WITH_SNMP:libnetsnmp USERID:=lldp=121:lldp=129 MENU:=1 endef @@ -107,8 +107,7 @@ CONFIGURE_ARGS += \ $(if $(CONFIG_LLDPD_WITH_CUSTOM),,--disable-custom) \ $(if $(CONFIG_LLDPD_WITH_SONMP),,--disable-sonmp) \ $(if $(CONFIG_LLDPD_WITH_JSON),--enable-json0,) \ - $(if $(CONFIG_LLDPD_WITH_SNMP),--with-snmp,) \ - $(if $(CONFIG_USE_GLIBC),,--without-libbsd) + $(if $(CONFIG_LLDPD_WITH_SNMP),--with-snmp,) TARGET_CFLAGS += -flto TARGET_LDFLAGS += -flto -Wl,--gc-sections,--as-needed