enable cgi & python at configure time, use new python packaging, cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/packages@8670 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
21fdbc0484
commit
d1cb1e20ea
@ -11,106 +11,99 @@ include $(TOPDIR)/rules.mk
|
|||||||
PKG_NAME:=rrdtool
|
PKG_NAME:=rrdtool
|
||||||
PKG_VERSION:=1.2.11
|
PKG_VERSION:=1.2.11
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_MD5SUM:=d61c5755cb77207f9ad3584b26e8bf08
|
|
||||||
|
|
||||||
PKG_SOURCE_URL:=http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub
|
PKG_SOURCE_URL:=http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_CAT:=zcat
|
PKG_MD5SUM:=d61c5755cb77207f9ad3584b26e8bf08
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
|
||||||
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
|
|
||||||
|
|
||||||
PKG_BUILD_DEPENDS:=libnotimpl
|
PKG_BUILD_DEPENDS:=libnotimpl
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
-include $(TOPDIR)/package/python/python-package.mk
|
||||||
|
|
||||||
define Package/rrd
|
define Package/rrdtool/Default
|
||||||
SECTION:=utils
|
SECTION:=utils
|
||||||
CATEGORY:=Utilities
|
CATEGORY:=Utilities
|
||||||
TITLE:=Round Robin Database (RRD) tools (v1.2.x)
|
TITLE:=Round Robin Database (RRD)
|
||||||
SUBMENU:=Round Robin Database (RRD) tools (v1.2.x)
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/librrd
|
define Package/librrd
|
||||||
$(call Package/rrd)
|
$(call Package/rrdtool/Default)
|
||||||
DEPENDS:=+libart +libfreetype +libpng +zlib
|
|
||||||
SECTION:=libs
|
SECTION:=libs
|
||||||
CATEGORY:=Utilities
|
CATEGORY:=Libraries
|
||||||
TITLE:=Round Robin Database (RRD) management library (v1.2.x)
|
TITLE+= management library (v1.2.x)
|
||||||
|
DEPENDS+= +libart +libfreetype +libpng +zlib
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/rrdcgi
|
define Package/rrdcgi
|
||||||
$(call Package/rrd)
|
$(call Package/rrdtool/Default)
|
||||||
DEPENDS:=librrd +cgilib
|
TITLE+= CGI graphing tool (v1.2.x)
|
||||||
SECTION:=utils
|
DEPENDS+= +librrd +cgilib
|
||||||
CATEGORY:=Utilities
|
|
||||||
TITLE:=Round Robin Database (RRD) CGI graphing tool (v1.2.x)
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/rrdtool
|
define Package/rrdtool
|
||||||
$(call Package/rrd)
|
$(call Package/rrdtool/Default)
|
||||||
DEPENDS:=librrd
|
TITLE+= management tools (v1.2.x)
|
||||||
SECTION:=utils
|
DEPENDS+= +librrd
|
||||||
CATEGORY:=Utilities
|
|
||||||
TITLE:=Round Robin Database (RRD) management tools (v1.2.x)
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/rrdpy
|
define PyPackage/rrdpy
|
||||||
$(call Package/rrd)
|
|
||||||
DEPENDS:=librrd +python
|
|
||||||
SECTION:=utils
|
|
||||||
CATEGORY:=Utilities
|
|
||||||
TITLE:=Round Robin Database (RRD) python bindings (v1.2.x)
|
TITLE:=Round Robin Database (RRD) python bindings (v1.2.x)
|
||||||
|
DEPENDS+= +librrd
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
CONFIGURE_ARGS += \
|
||||||
|
--enable-shared=yes \
|
||||||
|
--enable-static=yes \
|
||||||
|
--disable-rpath \
|
||||||
|
--with-gnu-ld \
|
||||||
|
--disable-mmap \
|
||||||
|
--disable-perl \
|
||||||
|
--disable-tcl \
|
||||||
|
--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 \
|
||||||
|
|
||||||
|
ifneq ($(SDK)$(CONFIG_PACKAGE_rrdcgi),)
|
||||||
|
CONFIGURE_ARGS += --enable-rrdcgi
|
||||||
|
else
|
||||||
|
CONFIGURE_ARGS += --disable-rrdcgi
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifneq ($(SDK)$(CONFIG_PACKAGE_rrdpy),)
|
||||||
|
CONFIGURE_ARGS += \
|
||||||
|
--enable-python
|
||||||
|
CONFIGURE_VARS += \
|
||||||
|
PYTHON="$(PYTHON)"
|
||||||
|
else
|
||||||
|
CONFIGURE_ARGS += --disable-python
|
||||||
|
endif
|
||||||
|
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
$(call Build/Configure/Default,--enable-shared=yes \
|
$(call Build/Configure/Default)
|
||||||
--enable-static=yes \
|
$(call libtool_disable_rpath)
|
||||||
--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)
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
rm -rf $(PKG_INSTALL_DIR)
|
$(MAKE) -C $(PKG_BUILD_DIR) all
|
||||||
mkdir -p $(PKG_INSTALL_DIR)
|
$(call libtool_fixup_libdir)
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
|
||||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
|
||||||
all install
|
|
||||||
ifneq ($(CONFIG_PACKAGE_rrdpy),n)
|
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR)/bindings/python \
|
|
||||||
pythondir=$(shell $(STAGING_DIR)/usr/bin/hostpython $(SCRIPT_DIR)/pylibdir.py) \
|
|
||||||
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/python2.5" \
|
|
||||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
|
||||||
all install
|
|
||||||
endif
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/rrdtool/install
|
define Build/InstallDev
|
||||||
$(INSTALL_DIR) $(1)/usr/bin
|
mkdir -p $(STAGING_DIR)/usr/include
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(1)/usr/bin/
|
$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(1)/usr/bin/
|
mkdir -p $(STAGING_DIR)/usr/lib
|
||||||
|
$(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.{a,so*} $(STAGING_DIR)/usr/lib/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/rrdpy/install
|
define Build/UninstallDev
|
||||||
$(INSTALL_DIR) $(1)/usr/lib/python2.5/site-packages
|
rm -rf $(STAGING_DIR)/usr/include/rrd.h \
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.5/site-packages/* \
|
$(STAGING_DIR)/usr/lib/librrd.{a,so*}
|
||||||
$(1)/usr/lib/python2.5/site-packages
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/rrdcgi/install
|
|
||||||
$(INSTALL_DIR) $(1)/usr/bin
|
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/librrd/install
|
define Package/librrd/install
|
||||||
@ -121,22 +114,23 @@ define Package/librrd/install
|
|||||||
$(1)/usr/share/rrdtool/fonts/
|
$(1)/usr/share/rrdtool/fonts/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/InstallDev
|
define Package/rrdcgi/install
|
||||||
mkdir -p $(STAGING_DIR)/usr/include
|
$(INSTALL_DIR) $(1)/usr/bin
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/
|
$(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(1)/usr/bin/
|
||||||
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/
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Build/UninstallDev
|
define PyPackage/rrdpy/install
|
||||||
rm -rf \
|
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
|
||||||
$(STAGING_DIR)/usr/include/rrd.h \
|
$(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/
|
||||||
$(STAGING_DIR)/usr/lib/librrd.a \
|
endef
|
||||||
$(STAGING_DIR)/usr/lib/librrd.so*
|
|
||||||
|
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/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,librrd))
|
$(eval $(call BuildPackage,librrd))
|
||||||
$(eval $(call BuildPackage,rrdcgi))
|
$(eval $(call BuildPackage,rrdcgi))
|
||||||
|
$(eval $(call PyPackage,rrdpy))
|
||||||
$(eval $(call BuildPackage,rrdtool))
|
$(eval $(call BuildPackage,rrdtool))
|
||||||
$(eval $(call BuildPackage,rrdpy))
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user