mirror of
https://github.com/openwrt/packages.git
synced 2026-04-15 10:51:55 +00:00
collectd: remove redundant liblua link flag
The link flag makes the main program depend on liblua in official package feeds, even if collectd-mod-lua is not installed. The plugin is already linked against liblua.so, so this can be removed. Signed-off-by: Qingfang Deng <dqfext@gmail.com> [added PKG_RELEASE bump]
This commit is contained in:
committed by
Hannu Nyman
parent
60c442a776
commit
aa0a14e2dd
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||||||
|
|
||||||
PKG_NAME:=collectd
|
PKG_NAME:=collectd
|
||||||
PKG_VERSION:=5.12.0
|
PKG_VERSION:=5.12.0
|
||||||
PKG_RELEASE:=54
|
PKG_RELEASE:=55
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||||
PKG_SOURCE_URL:=https://collectd.org/files/ \
|
PKG_SOURCE_URL:=https://collectd.org/files/ \
|
||||||
@@ -232,8 +232,7 @@ $(call Package/collectd/Default)
|
|||||||
DEPENDS:= +libpthread \
|
DEPENDS:= +libpthread \
|
||||||
+zlib \
|
+zlib \
|
||||||
+libltdl \
|
+libltdl \
|
||||||
+jshn \
|
+jshn
|
||||||
+PACKAGE_collectd-mod-lua:liblua
|
|
||||||
MENU:=1
|
MENU:=1
|
||||||
endef
|
endef
|
||||||
|
|
||||||
@@ -272,11 +271,6 @@ CONFIGURE_VARS+= \
|
|||||||
LDFLAGS="$$$$LDFLAGS -lm -lz" \
|
LDFLAGS="$$$$LDFLAGS -lm -lz" \
|
||||||
KERNEL_DIR="$(LINUX_DIR)"
|
KERNEL_DIR="$(LINUX_DIR)"
|
||||||
|
|
||||||
ifneq ($(CONFIG_PACKAGE_collectd-mod-lua),)
|
|
||||||
CONFIGURE_VARS+= \
|
|
||||||
LDFLAGS="$$$$LDFLAGS -llua"
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK),)
|
ifneq ($(CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK),)
|
||||||
CONFIGURE_ARGS+= \
|
CONFIGURE_ARGS+= \
|
||||||
--with-libgcrypt=$(STAGING_DIR)/usr
|
--with-libgcrypt=$(STAGING_DIR)/usr
|
||||||
|
|||||||
Reference in New Issue
Block a user