summaryrefslogtreecommitdiff
path: root/package/rrdtool
diff options
context:
space:
mode:
Diffstat (limited to 'package/rrdtool')
-rw-r--r--package/rrdtool/Makefile35
-rw-r--r--package/rrdtool/patches/patch-configure21
-rw-r--r--package/rrdtool/patches/patch-ltmain_sh11
3 files changed, 20 insertions, 47 deletions
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index a047f032c..840633559 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -4,25 +4,29 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= rrdtool
-PKG_VERSION:= 1.2.30
+PKG_VERSION:= 1.4.8
PKG_RELEASE:= 1
-PKG_MD5SUM:= 19b24f7184a8dbf7b48c1bbb565ad9fb
-PKG_DESCR:= Round Robin Database (RRD) management library and tools
+PKG_MD5SUM:= dbe59386db97fd2f2216729facd74ca8
+PKG_DESCR:= Round Robin Database (RRD) management library
PKG_SECTION:= libs
PKG_DEPENDS:= libart libfreetype libpng zlib
+PKG_DEPENDS+= glib cairo pango
PKG_BUILDDEP:= libxml2 cgilib freetype libart libpng
+PKG_BUILDDEP+= glib cairo pango
PKG_URL:= http://oss.oetiker.ch/
PKG_SITES:= http://oss.oetiker.ch/rrdtool/pub/
PKG_SUBPKGS:= LIBRRD RRDCGI RRDTOOL
-PKG_SECTION_RRDCGI:= misc
-PKG_SECTION_RRDTOOL:= misc
+PKGSC_RRDCGI:= misc
+PKGSD_RRDCGI:= RRD CGI
+PKGSC_RRDTOOL:= misc
+PKGSD_RRDTOOL:= RRD tool
include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDCGI}))
-$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION_RRDTOOL}))
+$(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDCGI}))
+$(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_RRDTOOL}))
CONFIGURE_ENV+= rd_cv_ieee_works=yes
CONFIGURE_ARGS+= --enable-rrdcgi \
@@ -30,21 +34,22 @@ CONFIGURE_ARGS+= --enable-rrdcgi \
--disable-perl \
--disable-ruby \
--disable-tcl \
- --disable-python \
- --without-x \
- --with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
+ --disable-python
TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/usr/include/freetype2
+TARGET_LDFLAGS+= -lglib-2.0
+XAKE_FLAGS+= GCC_HONOUR_COPTS=s
-post-install:
+rrdtool-install:
${INSTALL_DIR} ${IDIR_RRDTOOL}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/rrdtool ${WRKINST}/usr/bin/rrdupdate \
${IDIR_RRDTOOL}/usr/bin/
+
+rrdcgi-install:
${INSTALL_DIR} ${IDIR_RRDCGI}/usr/bin
${INSTALL_BIN} ${WRKINST}/usr/bin/rrdcgi ${IDIR_RRDCGI}/usr/bin/
+
+librrd-install:
${INSTALL_DIR} ${IDIR_LIBRRD}/usr/lib
- ${CP} ${WRKINST}/usr/lib/librrd.so.* ${IDIR_LIBRRD}/usr/lib/
- ${INSTALL_DIR} ${IDIR_LIBRRD}/usr/share/rrdtool/fonts
- ${CP} ${WRKBUILD}/src/DejaVuSansMono-Roman.ttf \
- ${IDIR_LIBRRD}/usr/share/rrdtool/fonts/
+ ${CP} ${WRKINST}/usr/lib/librrd*.so* ${IDIR_LIBRRD}/usr/lib/
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rrdtool/patches/patch-configure b/package/rrdtool/patches/patch-configure
deleted file mode 100644
index 852d96098..000000000
--- a/package/rrdtool/patches/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- rrdtool-1.2.30.orig/configure 2009-01-19 15:29:29.000000000 +0100
-+++ rrdtool-1.2.30/configure 2009-05-09 04:31:25.000000000 +0200
-@@ -26320,7 +26320,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
- if test "x/usr/include/libart-2.0" != "x"; then
-- CPPFLAGS="$CPPFLAGS -I/usr/include/libart-2.0"
-+ CPPFLAGS="$CPPFLAGS"
- fi
- { echo "$as_me:$LINENO: checking for art_vpath_add_point in -lart_lgpl_2" >&5
- echo $ECHO_N "checking for art_vpath_add_point in -lart_lgpl_2... $ECHO_C" >&6; }
-@@ -27916,7 +27916,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ex_check_save_CPPFLAGS=${CPPFLAGS}
- ex_check_save_LDFLAGS=${LDFLAGS}
- if test "x/usr/include/freetype2" != "x"; then
-- CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
-+ CPPFLAGS="$CPPFLAGS"
- fi
- { echo "$as_me:$LINENO: checking for FT_Init_FreeType in -lfreetype" >&5
- echo $ECHO_N "checking for FT_Init_FreeType in -lfreetype... $ECHO_C" >&6; }
diff --git a/package/rrdtool/patches/patch-ltmain_sh b/package/rrdtool/patches/patch-ltmain_sh
deleted file mode 100644
index 940e4a403..000000000
--- a/package/rrdtool/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- rrdtool-1.2.30.orig/ltmain.sh 2007-03-14 16:47:55.000000000 +0100
-+++ rrdtool-1.2.30/ltmain.sh 2011-01-16 22:22:28.000000000 +0100
-@@ -1623,7 +1623,7 @@ EOF
- # -pg pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-- -t[45]*|-txscale*|@*)
-+ -t[45]*|-txscale*|@*|-fstack-protector*|-flto)
-
- # Unknown arguments in both finalize_command and compile_command need
- # to be aesthetically quoted because they are evaled later.