fix target libxml2; bump version libxml2-2.9.4

diff --git a/make/libraries.mk b/make/libraries.mk
index bd7ac2767de636b1fc2b10990403af6cc3772c1e..305810e9893693f0be56de05df218080c7994016 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -289,9 +289,10 @@ $(D)/cortex-strings: $(ARCHIVE)/cortex-strings-git-$(CRTXSTR_GIT).tar.gz | $(TAR
        $(REMOVE)/cortex-strings-git-$(CRTXSTR_GIT)
        touch $@
 
-ifeq ($(PLATFORM), nevis)
-NEVIS_XML2_FLAGS = --with-minimum
-endif
+#ifeq ($(PLATFORM), nevis)
+NEVIS_XML2_FLAGS  = --without-iconv
+NEVIS_XML2_FLAGS += --with-minimum
+#endif
 $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX)
        $(UNTAR)/libxml2-$(LIBXML2_VER).tar.gz
        pushd $(BUILD_TMP)/libxml2-$(LIBXML2_VER) && \
@@ -303,12 +304,13 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX)
                        --disable-static \
                        --datarootdir=/.remove \
                        --without-python \
+                       --without-c14n \
                        --without-debug \
                        --without-docbook \
+                       --without-mem-debug \
                        --without-catalog \
-                       --without-zlib \
                        $(NEVIS_XML2_FLAGS) && \
-               $(MAKE) && \
+               $(MAKE) all && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX) && \
        mv $(TARGETPREFIX)/bin/xml2-config $(HOSTPREFIX)/bin
        $(REWRITE_LIBTOOL)/libxml2.la

diff --git a/make/versions.mk b/make/versions.mk
index 3cfefc9a9d40118935a7214d7384300c44e97135..5eb29b6988e783b5d78e2a71629bf8159ff4b5e6 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -79,7 +79,7 @@ LIBUSB_COMP_VER = 0.1.4
 LIBRTMP_VER = 2.4_p20131018
 
 # Libxml2 is the XML C parser and toolkit of Gnome
-LIBXML2_VER = 2.9.3
+LIBXML2_VER = 2.9.4
 
 # lua: easily embeddable scripting language
 LUA_ABIVER = 5.2