Re: [ptxdist] [PATCH 03/10] rrdtool: fix libxml2 handling

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Sun, Jan 25, 2015 at 01:37:19AM +0100, Robert Schwebel wrote:
> 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>
> ---
>  ...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..476309e
> --- /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, "")

m4 uses [] for empty arguments.

Michael

> + 
> + 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
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de