X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=utils%2Frrdtool%2FMakefile;h=88f3841b1ba79526771044c3c6bee9784d8da17f;hp=a89395aa5bd6763900633b842668b3f580795dbc;hb=289168da7d3b3b20ca039539871483bd25a4e325;hpb=ee073fd6ec25ca57aeff0c86c5a94aa0391056f6

diff --git a/utils/rrdtool/Makefile b/utils/rrdtool/Makefile
index a89395aa5b..88f3841b1b 100644
--- a/utils/rrdtool/Makefile
+++ b/utils/rrdtool/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,17 +9,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rrdtool
-PKG_VERSION:=1.2.11
+PKG_VERSION:=1.2.23
 PKG_RELEASE:=1
 
-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_MD5SUM:=d61c5755cb77207f9ad3584b26e8bf08
+PKG_MD5SUM:=dafa161bc9c61e57636a6085c87c1fe8
 
-PKG_BUILD_DEPENDS:=libnotimpl
+PKG_BUILD_DEPENDS:=libnotimpl python-core
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
--include $(TOPDIR)/package/python/python-package.mk
+-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk)
+ifneq ($(MAKECMDGOALS),download)
+  $(if $(DUMP)$(Build/Compile/PyMod),,$(error Python packaging code not found.))
+endif
 
 define Package/rrdtool/Default
   SECTION:=utils
@@ -34,7 +38,7 @@ $(call Package/rrdtool/Default)
   TITLE+= management library (v1.2.x)
   DEPENDS+= +libart +libfreetype +libpng +zlib
 endef
-	
+
 define Package/rrdcgi
 $(call Package/rrdtool/Default)
   TITLE+= CGI graphing tool (v1.2.x)
@@ -47,7 +51,7 @@ $(call Package/rrdtool/Default)
   DEPENDS+= +librrd
 endef
 
-define PyPackage/rrdpy
+define Package/rrdpy
   TITLE:=Round Robin Database (RRD) python bindings (v1.2.x)
   DEPENDS+= +librrd
 endef
@@ -60,13 +64,15 @@ CONFIGURE_ARGS += \
 	--disable-mmap \
 	--disable-perl \
 	--disable-tcl \
+	--disable-ruby \
 	--without-x \
 	--with-rrd-default-font="/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf" \
 
 CONFIGURE_VARS += \
-	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/libart-2.0" \
 	LIBS="-lnotimpl" \
 	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
@@ -83,40 +89,30 @@ else
   CONFIGURE_ARGS += --disable-python
 endif
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
-
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir)
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 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,so*} $(STAGING_DIR)/usr/lib/
-endef
-
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/include/rrd.h \
-		$(STAGING_DIR)/usr/lib/librrd.{a,so*} 
+	mkdir -p $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(1)/usr/include/
+	mkdir -p $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd_th.{a,so*} $(1)/usr/lib/
 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 Package/rrdcgi/install	
+define Package/rrdcgi/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
 endef
 
 define PyPackage/rrdpy/install
@@ -126,11 +122,12 @@ 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/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,librrd))
 $(eval $(call BuildPackage,rrdcgi))
 $(eval $(call PyPackage,rrdpy))
+$(eval $(call BuildPackage,rrdpy))
 $(eval $(call BuildPackage,rrdtool))