X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=utils%2Frrdtool%2FMakefile;h=8b7d386cead93dd8fd94f6f338b49cf48701d81f;hb=e090eea109a2b4485af18c7d7ee362ed056d8487;hp=534510febdd068ee57b8a969fb5f249e119d5e52;hpb=25df77133a0a87342f7a0a2a7299de6644eb67fd;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index 534510febd..8b7d386cea 100644
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -1,118 +1,140 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rrdtool
-PKG_VERSION:=1.2.11
+PKG_VERSION:=1.2.30
 PKG_RELEASE:=1
-PKG_MD5SUM:=d61c5755cb77207f9ad3584b26e8bf08
 
-PKG_SOURCE_URL:=http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub
+PKG_SOURCE_URL:=http://oss.oetiker.ch/rrdtool/pub/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_MD5SUM:=19b24f7184a8dbf7b48c1bbb565ad9fb
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_BUILD_DEPENDS:=python
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_PACKAGE_python-rrd \
+	CONFIG_PACKAGE_rrdcgi \
+
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+$(call include_mk, python-package.mk)
 
-define Package/rrd
+define Package/rrdtool/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=Round Robin Database (RRD) tools (v1.2.x)
-  SUBMENU:=Round Robin Database (RRD) tools (v1.2.x)
+  TITLE:=Round Robin Database (RRD)
+  URL:=http://oss.oetiker.ch/rrdtool/
 endef
 
 define Package/librrd
-  $(call Package/rrd)
-  DEPENDS:=+libart +libfreetype +libpng +zlib +libnotimpl
+$(call Package/rrdtool/Default)
   SECTION:=libs
-  CATEGORY:=Utilities
-  TITLE:=Round Robin Database (RRD) management library (v1.2.x)
+  CATEGORY:=Libraries
+  TITLE+= management library (v1.2.x)
+  DEPENDS+= +libart +libfreetype +libpng +zlib
 endef
-	
+
 define Package/rrdcgi
-  $(call Package/rrd)
-  DEPENDS:=librrd +cgilib
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Round Robin Database (RRD) CGI graphing tool (v1.2.x)
+$(call Package/rrdtool/Default)
+  TITLE+= CGI graphing tool (v1.2.x)
+  DEPENDS+= +librrd +cgilib
 endef
 
 define Package/rrdtool
-  $(call Package/rrd)
-  DEPENDS:=librrd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Round Robin Database (RRD) management tools (v1.2.x)
+$(call Package/rrdtool/Default)
+  TITLE+= management tools (v1.2.x)
+  DEPENDS+= +librrd
 endef
 
-define Build/Configure
-$(call Build/Configure/Default,--enable-shared=yes \
-                        --enable-static=yes \
-                        --disable-rpath \
-                        --with-gnu-ld \
-                        --enable-rrdcgi \
-                        --disable-mmap \
-                        --disable-perl \
-                        --disable-tcl \
-                        --disable-python \
-                        --without-x \
-                        --with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf, CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/libart-2.0" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \
-		LIBS="-lnotimpl" \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
-		rd_cv_ieee_works=yes)
+define Package/python-rrd
+$(call Package/rrdtool/Default)
+  SUBMENU:=Python
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE+= python bindings (v1.2.x)
+  DEPENDS+= +python-mini +librrd
 endef
 
-define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+CONFIGURE_ARGS += \
+	--enable-shared=yes \
+	--enable-static=yes \
+	--disable-rpath \
+	--with-gnu-ld \
+	--disable-mmap \
+	--disable-perl \
+	--disable-tcl \
+	--disable-ruby \
+	--without-x \
+	--with-rrd-default-font="/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf" \
+
+CONFIGURE_VARS += \
+	rd_cv_ieee_works=yes \
+	rd_cv_null_realloc=nope \
+	ac_cv_func_mmap_fixed_mapped=yes \
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_rrdcgi),)
+  CONFIGURE_ARGS += --enable-rrdcgi
+else
+  CONFIGURE_ARGS += --disable-rrdcgi
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_python-rrd),)
+  CONFIGURE_ARGS += \
+	--enable-python
+  CONFIGURE_VARS += \
+	PYTHON="$(PYTHON)"
+else
+  CONFIGURE_ARGS += --disable-python
+endif
+
+define Build/Compile
+	$(if $(Build/Compile/PyMod),,@echo Python packaging code not found.; false)
+	$(call Build/Compile/Default)
 endef
 
-define Package/rrdtool/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/lib/rrdtool-1.2/include/
+	$(INSTALL_DIR) $(1)/usr/lib/rrdtool-1.2/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd{,_th}.{a,so*} $(1)/usr/lib/rrdtool-1.2/lib/
 endef
 
-define Package/rrdcgi/install	
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
-endef
-
-define Package/librrd/install	
+define Package/librrd/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.so.* $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/share/rrdtool/fonts
 	$(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \
 		$(1)/usr/share/rrdtool/fonts/
 endef
 
-define Build/InstallDev	
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/
+define Package/rrdcgi/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
 endef
 
-define Build/UninstallDev	
-	rm -rf \
-		$(STAGING_DIR)/usr/include/rrd.h \
-		$(STAGING_DIR)/usr/lib/librrd.a \
-		$(STAGING_DIR)/usr/lib/librrd.so*
+define Package/rrdtool/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/
+endef
+
+define PyPackage/python-rrd/install
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
+	$(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/
 endef
 
 $(eval $(call BuildPackage,librrd))
 $(eval $(call BuildPackage,rrdcgi))
 $(eval $(call BuildPackage,rrdtool))
+
+$(eval $(call PyPackage,python-rrd))
+$(eval $(call BuildPackage,python-rrd))