X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=utils%2Fcollectd%2FMakefile;h=38798e32190a06fe0cbd15d480a0e08183e5744f;hb=5f9cae218d6775bb3184f7a18b91e9ff41c6b069;hp=0a2200e39206c90c0ac87728208d096f41158f68;hpb=b40494df31dffcec2545ee27918414c098a216cc;p=packages.git diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 0a2200e39..38798e321 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,15 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd -PKG_VERSION:=4.9.1 -PKG_RELEASE:=2 +PKG_VERSION:=4.10.8 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://collectd.org/files/ -PKG_MD5SUM:=5753496651c8c84afaea1fe290876bfc +PKG_MD5SUM:=7a60495208b9383225493c6dd6abb2f0 + +PKG_FIXUP:=autoreconf +PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4 -PKG_FIXUP:=libtool PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 +PKG_USE_MIPS16:=0 COLLECTD_PLUGINS_DISABLED:= \ apple_sensors \ @@ -43,6 +47,7 @@ COLLECTD_PLUGINS_DISABLED:= \ openvz \ oracle \ perl \ + pinba \ python \ routeros \ rrdcached \ @@ -76,10 +81,12 @@ COLLECTD_PLUGINS_SELECTED:= \ interface \ iptables \ irq \ + iwinfo \ load \ logfile \ madwifi \ memory \ + modbus \ mysql \ netlink \ network \ @@ -112,7 +119,7 @@ COLLECTD_PLUGINS_SELECTED:= \ write_http \ PKG_CONFIG_DEPENDS:= \ - $(patsubst %,CONFIG_PACKAGE_collectd-mod-%,$(COLLECTD_PLUGINS_SELECTED)) \ + $(patsubst %,CONFIG_PACKAGE_collectd-mod-%,$(subst _,-,$(COLLECTD_PLUGINS_SELECTED))) \ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk @@ -126,7 +133,7 @@ endef define Package/collectd $(call Package/collectd/Default) - DEPENDS:= +libpthread +zlib + DEPENDS:= +libpthread +zlib +libltdl +libip4tc MENU:=1 endef @@ -135,13 +142,17 @@ define Package/collectd/description and provides mechanismns to store the values in a variety of ways. endef +ifneq ($(CONFIG_avr32),) + TARGET_CFLAGS += -fsigned-char +endif + # common configure args CONFIGURE_ARGS+= \ --disable-debug \ --enable-daemon \ --enable-getifaddrs \ --with-nan-emulation \ - --with-fp-layout=nothing + --without-libgcrypt CONFIGURE_VARS+= \ CFLAGS="$$$$CFLAGS $(FPIC)" \ @@ -150,7 +161,7 @@ CONFIGURE_VARS+= \ CONFIGURE_PLUGIN= \ $(foreach m, $(1), \ - $(if $(CONFIG_PACKAGE_collectd-mod-$(m)),--enable-$(m),--disable-$(m)) \ + $(if $(CONFIG_PACKAGE_collectd-mod-$(subst _,-,$(m))),--enable-$(m),--disable-$(m)) \ ) CONFIGURE_ARGS+= \ @@ -163,11 +174,30 @@ ifneq ($(CONFIG_PACKAGE_collectd-mod-ascent),) CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2" endif +ifneq ($(CONFIG_BIG_ENDIAN),) + CONFIGURE_ARGS+= --with-fp-layout=endianflip +else + CONFIGURE_ARGS+= --with-fp-layout=nothing +endif + +ifneq ($(CONFIG_PACKAGE_collectd-mod-postgresql),) + CONFIGURE_ARGS+= --with-libpq="$(STAGING_DIR)/usr/" +endif + +ifneq ($(CONFIG_PACKAGE_collectd-mod-mysql),) + CONFIGURE_ARGS+= --with-libmysql="$(STAGING_DIR)/usr/" +endif + # exception: mod-netlink needs libnetlink from iproute ifneq ($(CONFIG_PACKAGE_collectd-mod-netlink),) CONFIGURE_ARGS+= --with-libnetlink="$(STAGING_DIR)/usr" endif +# exception: mod-modbus needs libmodbus +ifneq ($(CONFIG_PACKAGE_collectd-mod-modbus),) + CONFIGURE_ARGS+= --with-libmodbus="$(STAGING_DIR)/usr" +endif + # exception: mod-onewire needs libow-capi ifneq ($(CONFIG_PACKAGE_collectd-mod-onewire),) CONFIGURE_ARGS+= --with-libowcapi="$(STAGING_DIR)/usr" @@ -241,18 +271,20 @@ $(eval $(call BuildPlugin,exec,process exec input,exec,)) $(eval $(call BuildPlugin,filecount,file count input,filecount,)) $(eval $(call BuildPlugin,fscache,file-system based caching framework input,fscache,)) $(eval $(call BuildPlugin,interface,network interfaces input,interface,)) -$(eval $(call BuildPlugin,iptables,iptables status input,iptables,+PACKAGE_collectd-mod-iptables:iptables @(!LINUX_2_4||BROKEN))) +$(eval $(call BuildPlugin,iptables,iptables status input,iptables,+PACKAGE_collectd-mod-iptables:iptables +libiptc)) $(eval $(call BuildPlugin,irq,interrupt usage input,irq,)) +$(eval $(call BuildPlugin,iwinfo,libiwinfo wireless statistics,iwinfo,+PACKAGE_collectd-mod-iwinfo:libiwinfo)) $(eval $(call BuildPlugin,load,system load input,load,)) $(eval $(call BuildPlugin,logfile,log files output,logfile,)) $(eval $(call BuildPlugin,madwifi,MadWifi status input,madwifi,)) -$(eval $(call BuildPlugin,mysql,MySQL status input,mysql,+PACKAGE_collectd-mod-mysql:libmysqlclient)) +$(eval $(call BuildPlugin,mysql,MySQL status input,mysql,+PACKAGE_collectd-mod-mysql:libmysqlclient-r)) $(eval $(call BuildPlugin,memory,physical memory usage input,memory,)) -$(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip @(!LINUX_2_4||BROKEN))) +$(eval $(call BuildPlugin,modbus,read variables through libmodbus,modbus,+PACKAGE_collectd-mod-modbus:libmodbus @BROKEN)) +$(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-netlink:ip @BROKEN)) $(eval $(call BuildPlugin,network,network input/output,network)) $(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl)) $(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,)) -$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,@BROKEN)) +$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut)) $(eval $(call BuildPlugin,olsrd,OLSRd status input,olsrd,)) $(eval $(call BuildPlugin,onewire,onewire sensor input,onewire,+PACKAGE_collectd-mod-onewire:libow-capi @BROKEN)) $(eval $(call BuildPlugin,openvpn,OpenVPN traffic/compression input,openvpn,)) @@ -268,7 +300,7 @@ $(eval $(call BuildPlugin,syslog,syslog output,syslog,)) $(eval $(call BuildPlugin,tail,tail input,tail,)) $(eval $(call BuildPlugin,table,table-like structured file input,table,)) $(eval $(call BuildPlugin,teamspeak2,TeamSpeak2 input,teamspeak2,)) -$(eval $(call BuildPlugin,ted,The Energy Detective input,ted,)) +$(eval $(call BuildPlugin,ted,The Energy Detective input,ted,@((!TARGET_avr32)||BROKEN))) # fails on avr32 because of warnings treated as errors $(eval $(call BuildPlugin,tcpconns,TCP connection tracking input,tcpconns,)) $(eval $(call BuildPlugin,thermal,system temperatures input,thermal,)) $(eval $(call BuildPlugin,unixsock,unix socket output,unixsock,))