From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Robert Schwebel Date: Mon, 2 Feb 2015 12:49:57 +0100 Message-Id: <1422877804-31082-3-git-send-email-r.schwebel@pengutronix.de> In-Reply-To: <1422877804-31082-1-git-send-email-r.schwebel@pengutronix.de> References: <1422877804-31082-1-git-send-email-r.schwebel@pengutronix.de> Subject: [ptxdist] [PATCHv3 03/10] rrdtool: fix libxml2 handling Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Robert Schwebel 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 --- Changes since v2: * none 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 +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 +--- + 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