diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-09-04 20:20:32 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-09-05 23:24:39 +0200 |
| commit | ead5de9fd17d8e53d832a7076aa2748366f7f0ca (patch) | |
| tree | 52cbd295b6b0df89504bc53002dca64bcf147bfa | |
| parent | 0d8da99cbf058f559470fdc4ba03257be380d2e4 (diff) | |
| download | ptxdist-ead5de9fd17d8e53d832a7076aa2748366f7f0ca.tar.gz ptxdist-ead5de9fd17d8e53d832a7076aa2748366f7f0ca.tar.xz | |
[libxml2] version bump to 2.7.7
2.7.6 has problems with zlib-1.2.5:
"If you are using libxml version 2.7.6 or earlier, you will need to
update libxml to version 2.7.7 or later before installing zlib version
1.2.4 or later. libxml 2.7.6 and earlier made unnecessary assumptions
about the undocumented internal structure of zlib that were changed in
zlib 1.2.4 and result in libxml crashing. This was fixed in libxml
2.7.7."
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | patches/libxml2-2.7.6/series | 1 | ||||
| -rw-r--r-- | patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch (renamed from patches/libxml2-2.7.6/libxml2-2.6.27-config_in_sysroot.diff) | 17 | ||||
| -rw-r--r-- | patches/libxml2-2.7.7/series | 3 | ||||
| -rw-r--r-- | rules/libxml2.make | 7 |
4 files changed, 15 insertions, 13 deletions
diff --git a/patches/libxml2-2.7.6/series b/patches/libxml2-2.7.6/series deleted file mode 100644 index 4ac2c218b..000000000 --- a/patches/libxml2-2.7.6/series +++ /dev/null @@ -1 +0,0 @@ -libxml2-2.6.27-config_in_sysroot.diff diff --git a/patches/libxml2-2.7.6/libxml2-2.6.27-config_in_sysroot.diff b/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch index ec1e9766f..817c0b9d3 100644 --- a/patches/libxml2-2.7.6/libxml2-2.6.27-config_in_sysroot.diff +++ b/patches/libxml2-2.7.7/0001-xml2-config-is-not-SYSROOT-aware.patch @@ -1,18 +1,18 @@ From: Marc Kleine-Budde <mkl@pengutronix.de> -Subject: [patch] xml2-config is not $SYSROOT aware +Date: Sat, 4 Sep 2010 20:14:51 +0200 +Subject: [PATCH] xml2-config is not $SYSROOT aware This patch adds $SYSROOT support to xml2-config. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> - --- xml2-config.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 1 files changed, 1 insertions(+), 1 deletions(-) -Index: libxml2-2.7.6/xml2-config.in -=================================================================== ---- libxml2-2.7.6.orig/xml2-config.in -+++ libxml2-2.7.6/xml2-config.in +diff --git a/xml2-config.in b/xml2-config.in +index 2989325..4e170b6 100644 +--- a/xml2-config.in ++++ b/xml2-config.in @@ -1,6 +1,6 @@ #! /bin/sh @@ -21,3 +21,6 @@ Index: libxml2-2.7.6/xml2-config.in exec_prefix=@exec_prefix@ includedir=@includedir@ libdir=@libdir@ +-- +1.7.1 + diff --git a/patches/libxml2-2.7.7/series b/patches/libxml2-2.7.7/series new file mode 100644 index 000000000..404fb88b2 --- /dev/null +++ b/patches/libxml2-2.7.7/series @@ -0,0 +1,3 @@ +# generated by git-ptx-patches +0001-xml2-config-is-not-SYSROOT-aware.patch +# 39e3efe4b37f5ed3cf17be9609775022 - git-ptx-patches magic diff --git a/rules/libxml2.make b/rules/libxml2.make index ef9f8e93f..28ac53225 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -18,7 +18,7 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2 # # Paths and names # -LIBXML2_VERSION := 2.7.6 +LIBXML2_VERSION := 2.7.7 LIBXML2 := libxml2-$(LIBXML2_VERSION) LIBXML2_SUFFIX := tar.gz LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX) @@ -270,10 +270,7 @@ $(STATEDIR)/libxml2.targetinstall: @$(call install_fixup, libxml2,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") @$(call install_fixup, libxml2,DESCRIPTION,missing) - @$(call install_copy, libxml2, 0, 0, 0644, -, \ - /usr/lib/libxml2.so.2.7.6) - @$(call install_link, libxml2, libxml2.so.2.7.6, /usr/lib/libxml2.so.2) - @$(call install_link, libxml2, libxml2.so.2.7.6, /usr/lib/libxml2.so) + @$(call install_lib, libxml2, 0, 0, 0644, libxml2) @$(call install_finish, libxml2) |