update build libxml2 and libxslt

diff --git a/make/archives.mk b/make/archives.mk
index 40f069dbb2813e8e12e40359aad61074667c7b24..b3db2d08e0ba36c3608c0173d3b75a15b5e26767 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -190,11 +190,11 @@ $(ARCHIVE)/Lua-cURL$(LUACURL_VER).tar.xz:
 $(ARCHIVE)/slingshot-v6.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/slingshot-v6.tar.gz
 
-$(ARCHIVE)/libxml2-2.8.0.tar.gz:
-       $(WGET) http://www.fhloston-paradise.de/libxml2-2.8.0.tar.gz
+$(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz:
+       $(WGET) ftp://xmlsoft.org/libxml2/libxml2-$(LIBXML2_VER).tar.gz
 
 $(ARCHIVE)/libxslt-git-snapshot.tar.gz:
-       $(WGET) http://www.fhloston-paradise.de/libxslt-git-snapshot.tar.gz
+       $(WGET) ftp://xmlsoft.org/libxml2/libxslt-git-snapshot.tar.gz
 
 $(ARCHIVE)/rtmpdump-$(LIBRTMP_VER).tar.gz:
        $(WGET) http://crux.ster.zone/distfiles/rtmpdump-$(LIBRTMP_VER).tar.gz

diff --git a/make/libraries.mk b/make/libraries.mk
index 2472698375da9163717fc12e6c448995ba0c3c49..d83652f61601490de06c51db5443e19254eee9bb 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -230,9 +230,9 @@ $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz | $(TARGETPREFIX
        $(REMOVE)/libjpeg-turbo-$(JPEG_TURBO_VER)
        touch $@
 
-$(D)/libxslt: $(ARCHIVE)/libxml2-2.8.0.tar.gz $(ARCHIVE)/libxslt-git-snapshot.tar.gz | $(TARGETPREFIX)
-       $(UNTAR)/libxml2-2.8.0.tar.gz
-       pushd $(BUILD_TMP)/libxml2-2.8.0 && \
+$(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX)
+       $(UNTAR)/libxml2-$(LIBXML2_VER).tar.gz
+       pushd $(BUILD_TMP)/libxml2-$(LIBXML2_VER) && \
                $(CONFIGURE) \
                        --prefix= \
                        --build=$(BUILD) \
@@ -240,11 +240,23 @@ $(D)/libxslt: $(ARCHIVE)/libxml2-2.8.0.tar.gz $(ARCHIVE)/libxslt-git-snapshot.ta
                        --enable-shared \
                        --disable-static \
                        --datarootdir=/.remove \
-                       --without-python && \
+                       --without-python \
+                       --without-debug \
+                       --without-docbook \
+                       --without-catalog \
+                       --without-zlib \
+                       $(NEVIS_XML2_FLAGS) && \
                $(MAKE) && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX) && \
        $(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
+       rm -rf $(TARGETPREFIX)/.remove
+       $(REMOVE)/libxml2-$(LIBXML2_VER)
+       touch $@
+
+$(D)/libxslt: $(D)/libxml2 $(ARCHIVE)/libxslt-git-snapshot.tar.gz | $(TARGETPREFIX)
        $(UNTAR)/libxslt-git-snapshot.tar.gz
        pushd $(BUILD_TMP)/libxslt-1.1.28 && \
                $(CONFIGURE) \
@@ -256,20 +268,19 @@ $(D)/libxslt: $(ARCHIVE)/libxml2-2.8.0.tar.gz $(ARCHIVE)/libxslt-git-snapshot.ta
                        --datarootdir=/.remove \
                        --without-crypto \
                        --without-python \
-                       --with-libxml-src=$(BUILD_TMP)/libxml2-2.8.0 && \
+                       --with-libxml-include-prefix=$(TARGETPREFIX)/include/libxml2 \
+                       --with-libxml-libs-prefix=$(TARGETPREFIX)/lib && \
                $(MAKE) && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX)
        $(REWRITE_LIBTOOL)/libexslt.la
        $(REWRITE_LIBTOOL)/libxslt.la
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libexslt.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libxslt.pc
-       $(REMOVE)/libxml2-2.8.0
-       $(REMOVE)/libxslt-1.1.28
        rm -rf $(TARGETPREFIX)/lib/libxslt-plugins/
-       rm -rf $(TARGETPREFIX)/lib/xml2Conf.sh
        rm -rf $(TARGETPREFIX)/lib/xsltConf.sh
-       rm -rf $(TARGETPREFIX)/bin/xml2-config
        rm -rf $(TARGETPREFIX)/bin/xslt-config
+       rm -rf $(TARGETPREFIX)/.remove
+       $(REMOVE)/libxslt-1.1.28
        touch $@
 
 $(D)/libbluray: $(ARCHIVE)/libbluray-0.5.0.tar.bz2 | $(TARGETPREFIX)

diff --git a/make/versions.mk b/make/versions.mk
index 635d504f9282274a07d09a5ed57db7d46262879c..18d89366a341344c39b0c75908764dffdf41e247 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -27,6 +27,9 @@ LIBUPNP_VER = 1.6.19
 # including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://. 
 LIBRTMP_VER = 2.4_p20131018
 
+# Libxml2 is the XML C parser and toolkit of Gnome
+LIBXML2_VER = 2.9.3
+
 # lua: easily embeddable scripting language
 LUA_ABIVER = 5.2
 LUA_VER=$(LUA_ABIVER).3