bump version libxml2-2.9.9; fix xml2-config

diff --git a/make/libraries.mk b/make/libraries.mk
index 78d5c4a1f4ae94434c61819943df4940560b11f1..5befa4e3712e33b3f47740ffd70a08a452df4ee6 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -618,11 +618,11 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX)
                        $(NEVIS_XML2_FLAGS) && \
                $(MAKE) all && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX) && \
+       sed -i "s,^prefix=.*,prefix='$(TARGETPREFIX)'," $(TARGETPREFIX)/bin/xml2-config
        mv $(TARGETPREFIX)/bin/xml2-config $(HOSTPREFIX)/bin
        $(REWRITE_LIBTOOL)/libxml2.la
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libxml-2.0.pc
        rm -rf $(TARGETPREFIX)/lib/xml2Conf.sh
-       rm -rf $(TARGETPREFIX)/bin/xml2-config
        $(REMOVE)/libxml2-$(LIBXML2_VER)
        $(TOUCH)
 

diff --git a/make/versions.mk b/make/versions.mk
index 837281267009c85303f8a675ba085a1c57d1f33e..8aa8f5448a3a2eb506f7e3b208cce1d6d3031075 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -148,7 +148,7 @@ LIBRTMP_VER = 2.4_p20131018
 LIBROXML_VER = 2.3.0
 
 # Libxml2 is the XML C parser and toolkit of Gnome
-LIBXML2_VER = 2.9.9
+LIBXML2_VER = 2.9.4
 
 # lua: easily embeddable scripting language
 LUA_ABIVER = 5.2