diff options
| author | Alexander Dahl <post@lespocky.de> | 2014-11-26 18:43:51 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-11-27 09:52:01 +0100 |
| commit | e63c9223261d9db902c33ad4c4b06f5a63b721be (patch) | |
| tree | 108f99a3ca5bf70c57bf7d006d029c13efc4a306 /rules | |
| parent | 5080376b13496951c6c64a00016602e2ed621823 (diff) | |
| download | ptxdist-e63c9223261d9db902c33ad4c4b06f5a63b721be.tar.gz ptxdist-e63c9223261d9db902c33ad4c4b06f5a63b721be.tar.xz | |
libxml2: update to 2.9.2
Also integrated two changes from upstream fixing two minor issues.
Build successfully tested against all ptxdist packages requiring
libxml2, no runtime tests.
Signed-off-by: Alexander Dahl <post@lespocky.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/host-libxml2.make | 5 | ||||
| -rw-r--r-- | rules/libxml2.in | 7 | ||||
| -rw-r--r-- | rules/libxml2.make | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/rules/host-libxml2.make b/rules/host-libxml2.make index c4a4b4b1e..e731e2c46 100644 --- a/rules/host-libxml2.make +++ b/rules/host-libxml2.make @@ -32,6 +32,9 @@ HOST_LIBXML2_ENV := $(HOST_ENV) HOST_LIBXML2_AUTOCONF := \ $(HOST_AUTOCONF) \ --disable-static \ - --without-iconv + --without-iconv \ + --without-icu \ + --without-python \ + --without-lzma # vim: syntax=make diff --git a/rules/libxml2.in b/rules/libxml2.in index 72c17251c..bfbbf4d55 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 @@ -264,4 +265,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 36450eac7..1b1b0428b 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2 # # Paths and names # -LIBXML2_VERSION := 2.7.7 -LIBXML2_MD5 := 9abc9959823ca9ff904f1fbcf21df066 +LIBXML2_VERSION := 2.9.2 +LIBXML2_MD5 := 9e6a9aca9d155737868b3dc5fd82f788 LIBXML2 := libxml2-$(LIBXML2_VERSION) LIBXML2_SUFFIX := tar.gz LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX) @@ -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 \ + --without-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 \ |