From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mout.kundenserver.de ([212.227.17.24]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1XriDn-0000OA-LU for ptxdist@pengutronix.de; Fri, 21 Nov 2014 08:01:36 +0100 From: Alexander Dahl Date: Fri, 21 Nov 2014 08:00:37 +0100 Message-Id: <1416553238-9308-2-git-send-email-post@lespocky.de> In-Reply-To: <1416553238-9308-1-git-send-email-post@lespocky.de> References: <20141119115158.GJ16550@pengutronix.de> <1416553238-9308-1-git-send-email-post@lespocky.de> Subject: [ptxdist] [PATCH 2/2] libxml2: handle new ./configure options 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 Signed-off-by: Alexander Dahl --- 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 # 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. + 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 \ -- 1.7.10.4 -- ptxdist mailing list ptxdist@pengutronix.de