diff options
| author | Clemens Gruber <clemens.gruber@pqgruber.com> | 2016-12-19 21:36:23 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-01-05 17:37:34 +0100 |
| commit | 91a4994ce14633cacafae512e5808842cdc833f0 (patch) | |
| tree | dfbd87fc13c22f272fa4c86d795cdd4a6806a3a2 /rules | |
| parent | d102c545323ee7c926db19f84bab1995369f9595 (diff) | |
| download | ptxdist-91a4994ce14633cacafae512e5808842cdc833f0.tar.gz ptxdist-91a4994ce14633cacafae512e5808842cdc833f0.tar.xz | |
rrdtool: update 1.4.9 -> 1.6.0 and make more modular
Only depend on libxml2 if rrd_restore is enabled and add missing
configure options explicitly.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/rrdtool.in | 14 | ||||
| -rw-r--r-- | rules/rrdtool.make | 11 |
2 files changed, 19 insertions, 6 deletions
diff --git a/rules/rrdtool.in b/rules/rrdtool.in index d69d404f9..fa7e1de1c 100644 --- a/rules/rrdtool.in +++ b/rules/rrdtool.in @@ -8,9 +8,10 @@ menuconfig RRDTOOL select CAIRO_PDF if RRDTOOL_RRD_GRAPH select CAIRO_PS if RRDTOOL_RRD_GRAPH select PANGO if RRDTOOL_RRD_GRAPH - select LIBXML2 - select LIBXML2_SAX1 - select LIBXML2_READER + select LIBXML2 if RRDTOOL_RRD_RESTORE + select LIBXML2_SAX1 if RRDTOOL_RRD_RESTORE + select LIBXML2_READER if RRDTOOL_RRD_RESTORE + # for autotools only select HOST_GETTEXT prompt "rrdtool " @@ -61,6 +62,13 @@ config RRDTOOL_RRDUPDATE help Store a new set of values into the RRD +config RRDTOOL_RRD_RESTORE + bool + prompt "enable rrd restore" + help + rrd restore reads the XML representation of an RRD via libxml2 + and converts it to the native RRD format. + config RRDTOOL_WRAP bool prompt "build in support for libwrap (tcp wrapper)" diff --git a/rules/rrdtool.make b/rules/rrdtool.make index 2e7e09059..2c7453811 100644 --- a/rules/rrdtool.make +++ b/rules/rrdtool.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_RRDTOOL) += rrdtool # # Paths and names # -RRDTOOL_VERSION := 1.4.9 -RRDTOOL_MD5 := 1cea5a9efd6a48ac4035b0f9c7e336cf +RRDTOOL_VERSION := 1.6.0 +RRDTOOL_MD5 := 4ff52cc44b935b02d2742e6875094da5 RRDTOOL := rrdtool-$(RRDTOOL_VERSION) RRDTOOL_SUFFIX := tar.gz RRDTOOL_URL := http://oss.oetiker.ch/rrdtool/pub/$(RRDTOOL).$(RRDTOOL_SUFFIX) @@ -40,14 +40,20 @@ RRDTOOL_CONF_ENV := \ RRDTOOL_CONF_TOOL := autoconf RRDTOOL_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --disable-docs \ + --disable-examples \ + --$(call ptx/endis, PTXCONF_RRDTOOL_RRDCACHED)-rrdcached \ --$(call ptx/endis, PTXCONF_RRDTOOL_RRDCGI)-rrdcgi \ --$(call ptx/endis, PTXCONF_RRDTOOL_RRD_GRAPH)-rrd_graph \ + --$(call ptx/endis, PTXCONF_RRDTOOL_RRD_RESTORE)-rrd_restore \ --enable-mmap \ --enable-pthread \ + --enable-flock \ --disable-static-programs \ --disable-nls \ --disable-rpath \ --disable-libdbi \ + --disable-librados \ --$(call ptx/endis, PTXCONF_RRDTOOL_WRAP)-libwrap \ --disable-perl \ --disable-ruby \ @@ -88,7 +94,6 @@ ifdef PTXCONF_RRDTOOL_RRDUPDATE endif @$(call install_lib, rrdtool, 0, 0, 0644, librrd) - @$(call install_lib, rrdtool, 0, 0, 0644, librrd_th) @$(call install_finish, rrdtool) |