aboutsummaryrefslogtreecommitdiffstats
path: root/package/rrdcollect
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2005-09-08 22:01:19 +0000
committerNicolas Thill <nico@openwrt.org>2005-09-08 22:01:19 +0000
commitbaa012fc37408dc8c17808d2b9c184a876d7cb75 (patch)
tree832d2a63a4346d4a01d0689c2c4388fe42953d8f /package/rrdcollect
parenta18a87fb6d97d6e18e1322520873269399844da4 (diff)
downloadupstream-baa012fc37408dc8c17808d2b9c184a876d7cb75.tar.gz
upstream-baa012fc37408dc8c17808d2b9c184a876d7cb75.tar.bz2
upstream-baa012fc37408dc8c17808d2b9c184a876d7cb75.zip
add rrdtool1 (v1.0.x) and enable it by default,
disable rrdtool (v1.2.x), change Maintainer in control files, tweak Makefiles git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1881 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/rrdcollect')
-rw-r--r--package/rrdcollect/Config.in2
-rw-r--r--package/rrdcollect/Makefile12
-rw-r--r--package/rrdcollect/ipkg/rrdcollect.control4
3 files changed, 12 insertions, 6 deletions
diff --git a/package/rrdcollect/Config.in b/package/rrdcollect/Config.in
index e7f2919058..7dad23275f 100644
--- a/package/rrdcollect/Config.in
+++ b/package/rrdcollect/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_RRDCOLLECT
tristate "rrdcollect - Round-Robin Database (RRD) collecting daemon"
default m if CONFIG_DEVEL
- select BR2_PACKAGE_LIBRRD
+ depends BR2_PACKAGE_LIBRRD || BR2_PACKAGE_LIBRRD1
help
RRDcollect is a daemon which polls ceratin files in /proc/
directory, gathering data and storing it inside RRDtool's
diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile
index 94dea16a30..b3be69a983 100644
--- a/package/rrdcollect/Makefile
+++ b/package/rrdcollect/Makefile
@@ -14,6 +14,10 @@ PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+ifneq ($(BR2_PACKAGE_LIBRRD),)
+RRDTOOL_LIBS:=-lart_lgpl_2 -lfreetype -lpng
+endif
+
include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,RRDCOLLECT,rrdcollect,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
@@ -23,9 +27,9 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \
- CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
- LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
- LIBS="-lart_lgpl_2 -lfreetype -lpng -lz" \
+ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+ LIBS="$(RRDTOOL_LIBS) -lz" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
ac_cv_func_malloc_0_nonnull=yes \
./configure \
@@ -48,6 +52,8 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
$(DISABLE_LARGEFILE) \
--enable-shared \
--disable-static \
+ --disable-rpath \
+ --with-gnu-ld \
--enable-exec \
--without-rrdtool \
--with-librrd \
diff --git a/package/rrdcollect/ipkg/rrdcollect.control b/package/rrdcollect/ipkg/rrdcollect.control
index e1429b63ac..bdc7adb692 100644
--- a/package/rrdcollect/ipkg/rrdcollect.control
+++ b/package/rrdcollect/ipkg/rrdcollect.control
@@ -1,9 +1,9 @@
Package: rrdcollect
Priority: optional
Section: admin
-Maintainer: Oliver Ertl <oliver@ertl-net.net>, OpenWrt Developers <bugs@openwrt.org>
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Oliver Ertl <oliver@ertl-net.net>
Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/rrdcollect/
-Depends: librrd
+Depends: librrd | librrd1
Description: Round-Robin Database (RRD) collecting daemon
RRDcollect is a daemon which polls certain files in /proc/
directory, gathering data and storing it inside RRDtool's