diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-08 22:01:19 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-08 22:01:19 +0000 |
| commit | bd2218a04ffa7abbbcda591b53d526d6e8eba605 (patch) | |
| tree | 0989a9c3ae1610495bfad510d17427982da59c16 /openwrt/package/rrdcollect | |
| parent | 1739772b6f5411320fa0e11d5aa70634cd406d9b (diff) | |
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@1881 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/package/rrdcollect')
| -rw-r--r-- | openwrt/package/rrdcollect/Config.in | 2 | ||||
| -rw-r--r-- | openwrt/package/rrdcollect/Makefile | 12 | ||||
| -rw-r--r-- | openwrt/package/rrdcollect/ipkg/rrdcollect.control | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/openwrt/package/rrdcollect/Config.in b/openwrt/package/rrdcollect/Config.in index e7f291905..7dad23275 100644 --- a/openwrt/package/rrdcollect/Config.in +++ b/openwrt/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/openwrt/package/rrdcollect/Makefile b/openwrt/package/rrdcollect/Makefile index 94dea16a3..b3be69a98 100644 --- a/openwrt/package/rrdcollect/Makefile +++ b/openwrt/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/openwrt/package/rrdcollect/ipkg/rrdcollect.control b/openwrt/package/rrdcollect/ipkg/rrdcollect.control index e1429b63a..bdc7adb69 100644 --- a/openwrt/package/rrdcollect/ipkg/rrdcollect.control +++ b/openwrt/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 |