From: Robert Schwebel <r.schwebel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Subject: [ptxdist] [PATCHv2 03/10] rrdtool: fix libxml2 handling
Date: Mon, 26 Jan 2015 23:13:05 +0100 [thread overview]
Message-ID: <1422310392-18538-3-git-send-email-r.schwebel@pengutronix.de> (raw)
In-Reply-To: <1422310392-18538-1-git-send-email-r.schwebel@pengutronix.de>
The configure script searches for the libxml2 headers in /usr/include,
so we remove the hardcoded path here.
The check is searching for xmlParseFile, which is part of the SAX2 API.
This means we need to enable the feature in libxml2.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
---
Changes since v1:
* remove empty argument in EX_CHECK_ALL
...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 | 1 +
4 files changed, 33 insertions(+)
create mode 100644 patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
create mode 120000 patches/rrdtool-1.4.9/autogen.sh
create 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
new file mode 100644
index 0000000..33dfd6f
--- /dev/null
+++ b/patches/rrdtool-1.4.9/0001-configure.ac-don-t-specify-hardcoded-include-search-.patch
@@ -0,0 +1,27 @@
+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
new file mode 120000
index 0000000..9f8a4cb
--- /dev/null
+++ b/patches/rrdtool-1.4.9/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/rrdtool-1.4.9/series b/patches/rrdtool-1.4.9/series
new file mode 100644
index 0000000..8f63465
--- /dev/null
+++ b/patches/rrdtool-1.4.9/series
@@ -0,0 +1,4 @@
+# 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 0e83e66..3ae66d7 100644
--- a/rules/rrdtool.in
+++ b/rules/rrdtool.in
@@ -9,6 +9,7 @@ menuconfig RRDTOOL
select CAIRO_PS
select PANGO
select LIBXML2
+ select LIBXML2_SAX1
# for autotools only
select HOST_GETTEXT
prompt "rrdtool "
--
2.1.4
--
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2015-01-26 22:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-26 22:13 [ptxdist] [PATCHv2 01/10] rrdtool: version bump 1.4.7 -> 1.4.9 Robert Schwebel
2015-01-26 22:13 ` [ptxdist] [PATCHv2 02/10] rrdtool: audit configure options Robert Schwebel
2015-01-26 22:13 ` Robert Schwebel [this message]
2015-01-26 22:13 ` [ptxdist] [PATCHv2 04/10] rrdtool: make graph functionality optional Robert Schwebel
2015-01-26 22:13 ` [ptxdist] [PATCHv2 05/10] rrdtool: install multithreaded library Robert Schwebel
2015-01-26 22:13 ` [ptxdist] [PATCHv2 06/10] collectd: add base functionality Robert Schwebel
2015-01-27 7:40 ` Michael Olbrich
2015-01-27 7:43 ` Michael Olbrich
2015-01-26 22:13 ` [ptxdist] [PATCHv2 07/10] collectd: add support for rrdtool plugin Robert Schwebel
2015-01-26 22:13 ` [ptxdist] [PATCHv2 08/10] collectd: add support for syslog plugin Robert Schwebel
2015-01-26 22:13 ` [ptxdist] [PATCHv2 09/10] collectd: add support for cpu plugin Robert Schwebel
2015-01-26 22:13 ` [ptxdist] [PATCHv2 10/10] collectd: add support for logfile plugin Robert Schwebel
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=1422310392-18538-3-git-send-email-r.schwebel@pengutronix.de \
--to=r.schwebel@pengutronix.de \
--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