From: Clemens Gruber <clemens.gruber@pqgruber.com>
To: ptxdist@pengutronix.de
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Subject: [ptxdist] [PATCH] rrdtool: update to 1.6.0 and make more modular
Date: Thu, 15 Dec 2016 14:52:16 +0100 [thread overview]
Message-ID: <20161215135222.16594-8-clemens.gruber@pqgruber.com> (raw)
In-Reply-To: <20161215135222.16594-1-clemens.gruber@pqgruber.com>
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
...c-don-t-specify-hardcoded-include-search-.patch | 27 ----------------------
patches/rrdtool-1.4.9/autogen.sh | 1 -
patches/rrdtool-1.4.9/series | 4 ----
rules/rrdtool.in | 14 ++++++++---
rules/rrdtool.make | 10 +++++---
5 files changed, 18 insertions(+), 38 deletions(-)
delete mode 100644 patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
delete mode 120000 patches/rrdtool-1.4.9/autogen.sh
delete mode 100644 patches/rrdtool-1.4.9/series
diff --git a/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch b/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
deleted file mode 100644
index 33dfd6f..0000000
--- a/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Sat, 24 Jan 2015 20:57:27 +0100
-Subject: [PATCH] configure.ac: don't specify hardcoded include search path
-
-If we crosscompile rrdtool or packetize for a distribution, libxml2
-headers may be installed in a SYSROOT/DESTDIR directory, not in
-/usr/include. For the cross compile usecase, this leaks a host header
-file in.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9e934595b102..793e02874d4b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -540,7 +540,7 @@ EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h,
- EX_CHECK_ALL(cairo, cairo_ps_surface_create, cairo-ps.h, cairo-ps, 1.10.2, http://cairographics.org/releases/, "")
- EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
- fi
--EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html, /usr/include/libxml2)
-+EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h, libxml-2.0, 2.7.8, http://xmlsoft.org/downloads.html)
-
- if test "$EX_CHECK_ALL_ERR" = "YES"; then
- AC_MSG_ERROR([Please fix the library issues listed above and try again.])
diff --git a/patches/rrdtool-1.4.9/autogen.sh b/patches/rrdtool-1.4.9/autogen.sh
deleted file mode 120000
index 9f8a4cb..0000000
--- a/patches/rrdtool-1.4.9/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/rrdtool-1.4.9/series b/patches/rrdtool-1.4.9/series
deleted file mode 100644
index 8f63465..0000000
--- a/patches/rrdtool-1.4.9/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
-# 4f69babc0b922fa5b09478ce957d196a - git-ptx-patches magic
diff --git a/rules/rrdtool.in b/rules/rrdtool.in
index d69d404..fa7e1de 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 2e7e090..692a3d6 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,19 @@ 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 \
--disable-static-programs \
--disable-nls \
--disable-rpath \
--disable-libdbi \
+ --disable-librados \
--$(call ptx/endis, PTXCONF_RRDTOOL_WRAP)-libwrap \
--disable-perl \
--disable-ruby \
@@ -88,7 +93,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)
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2016-12-15 13:53 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-15 13:52 [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] dbus: bump version Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] file: " Clemens Gruber
2016-12-16 15:05 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] glib: " Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] iperf: version bump Clemens Gruber
2016-12-16 15:12 ` Michael Olbrich
2016-12-17 19:51 ` Clemens Gruber
2017-01-04 16:33 ` Michael Olbrich
2017-01-04 20:34 ` Robert Schwebel
2016-12-15 13:52 ` [ptxdist] [PATCH] iproute2: bump version Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] projectroot: Fix HTML syntax in examples Clemens Gruber
2016-12-15 13:52 ` Clemens Gruber [this message]
2016-12-16 15:22 ` [ptxdist] [PATCH] rrdtool: update to 1.6.0 and make more modular Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] sqlite: bump version Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] systemd-bootchart: update to 231 Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] tmux: bump version Clemens Gruber
2016-12-16 15:25 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] u-boot-tools: " Clemens Gruber
2016-12-15 13:52 ` [ptxdist] [PATCH] util-linux-ng: update to 2.29 and fix URL deduction Clemens Gruber
2016-12-16 15:30 ` Michael Olbrich
2016-12-15 13:52 ` [ptxdist] [PATCH] picocom: update to version 2.2 Clemens Gruber
2016-12-16 15:53 ` [ptxdist] [PATCH] collectd: update to 5.7.0 and add sensors support Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161215135222.16594-8-clemens.gruber@pqgruber.com \
--to=clemens.gruber@pqgruber.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox