On Fri, Nov 21, 2014 at 08:00:37AM +0100, Alexander Dahl wrote:
>
> Signed-off-by: Alexander Dahl <[email protected]>
Please squash this into the other patch.
> ---
> rules/host-libxml2.make | 3 ++-
> rules/libxml2.in | 13 +++++++++++++
> rules/libxml2.make | 2 ++
> 3 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/rules/host-libxml2.make b/rules/host-libxml2.make
> index c4a4b4b..2940c9b 100644
> --- a/rules/host-libxml2.make
> +++ b/rules/host-libxml2.make
> @@ -32,6 +32,7 @@ HOST_LIBXML2_ENV := $(HOST_ENV)
> HOST_LIBXML2_AUTOCONF := \
> $(HOST_AUTOCONF) \
> --disable-static \
> - --without-iconv
> + --without-iconv \
> + --without-lzma
--without-icu ??
>
> # vim: syntax=make
> diff --git a/rules/libxml2.in b/rules/libxml2.in
> index 72c1725..8642296 100644
> --- a/rules/libxml2.in
> +++ b/rules/libxml2.in
> @@ -6,6 +6,7 @@ menuconfig LIBXML2
> select LIBC_M
> select LIBC_DL if LIBXML2_MODULES
> select ZLIB if LIBXML2_ZLIB
> + select XZ if LIBXML2_LZMA
> select PYTHON if LIBXML2_PYTHON
> help
> Libxml2 is a XML C parser and toolkit. XML itself is a
> @@ -90,6 +91,12 @@ config LIBXML2_HTTP
> help
> Add HTTP support.
>
> +config LIBXML2_ICU
> + bool
> + prompt "ICU support"
> + help
> + Add ICU support.
This requires icu to install icu-config to sysroot-cross.
I don't mind if you disable icu support unconditionally.
If someone needs it then they can extend the rule.
> +
> config LIBXML2_ISO8859X
> bool
> default y
> @@ -264,4 +271,10 @@ config LIBXML2_ZLIB
> default y
> prompt "zlib (compression) support"
>
> +config LIBXML2_LZMA
> + bool
> + prompt "lzma (compression) support"
> + help
> + LZMA (compression) support with liblzma from XZ tools.
> +
> endif
> diff --git a/rules/libxml2.make b/rules/libxml2.make
> index 3392e5e..6b5c05c 100644
> --- a/rules/libxml2.make
> +++ b/rules/libxml2.make
> @@ -54,8 +54,10 @@ LIBXML2_AUTOCONF := \
> --$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \
> --$(call ptx/wwo, PTXCONF_LIBXML2_HTML)-html \
> --$(call ptx/wwo, PTXCONF_LIBXML2_HTTP)-http \
> + --$(call ptx/wwo, PTXCONF_LIBXML2_ICU)-icu \
> --$(call ptx/wwo, PTXCONF_LIBXML2_ISO8859X)-iso8859x \
> --$(call ptx/wwo, PTXCONF_LIBXML2_LEGACY)-legacy \
> + --$(call ptx/wwo, PTXCONF_LIBXML2_LZMA)-lzma \
> --$(call ptx/wwo, PTXCONF_LIBXML2_MEM_DEBUG)-mem-debug \
> --$(call ptx/wwo, PTXCONF_LIBXML2_MINIMUM)-minimum \
> --$(call ptx/wwo, PTXCONF_LIBXML2_OUTPUT)-output \
Nothing for this patch, but this really needs to be cleaned up. I think
several of those options should just be enable unconditionally...
Michael
> --
> 1.7.10.4
>
>
> --
> ptxdist mailing list
> [email protected]
>
--
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
[email protected]
