fix openssl-0.9.8zh; update build libxml2

diff --git a/make/libraries.mk b/make/libraries.mk
index 1c01410460cf380695ad64749f365adc2dae7cd9..36b64fa075260eb28e50f5acd83038142e9637e4 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -116,13 +116,12 @@ $(D)/openssl: $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz | $(TARG
        $(UNTAR)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz
        pushd $(BUILD_TMP)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER) && \
                CC=$(TARGET)-gcc \
-               ./Configure shared no-hw no-engine linux-generic32 --prefix=/ --openssldir=/.remove && \
+               ./Configure shared no-hw linux-generic32 --prefix=/ --openssldir=/.remove && \
                $(MAKE) all && \
                $(MAKE) install_sw INSTALL_PREFIX=$(TARGETPREFIX)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openssl.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libcrypto.pc
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libssl.pc
-       rm -fr $(TARGETPREFIX)/lib/engines
        rm -r $(TARGETPREFIX)/.remove $(TARGETPREFIX)/bin/openssl $(TARGETPREFIX)/bin/c_rehash
        $(REMOVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER)
        pushd $(TARGETPREFIX)/lib && \
@@ -231,6 +230,10 @@ $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz | $(TARGETPREFIX
        $(REMOVE)/libjpeg-turbo-$(JPEG_TURBO_VER)
        touch $@
 
+ifeq ($(PLATFORM), nevis)
+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) && \
@@ -245,7 +248,8 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX)
                        --without-debug \
                        --without-docbook \
                        --without-catalog \
-                       --without-zlib && \
+                       --without-zlib \
+                       $(NEVIS_XML2_FLAGS) && \
                $(MAKE) && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX) && \
        mv $(TARGETPREFIX)/bin/xml2-config $(HOSTPREFIX)/bin
@@ -428,13 +432,13 @@ else
 FFMPEG_CONFIGURE += --cpu=armv6 --extra-cflags="-I$(TARGETPREFIX)/include"
 endif
 
-$(D)/ffmpeg: $(D)/librtmp $(D)/libxslt | $(TARGETPREFIX)
+$(D)/ffmpeg: $(D)/librtmp $(D)/libxml2 | $(TARGETPREFIX)
        tar -C $(SOURCE_DIR)/git/LIBRARIES -cp ffmpeg/$(CST_FFMPEG_VERSION) --exclude=.git | tar -C $(BUILD_TMP) -x
        pushd $(BUILD_TMP)/ffmpeg/$(CST_FFMPEG_VERSION) && \
                $(BUILDENV) \
                ./configure \
                        $(FFMPEG_CONFIGURE) \
-                       --extra-ldflags="-L$(TARGETPREFIX)/lib -lxml2" \
+                       --extra-ldflags="-L$(TARGETPREFIX)/lib -lxml2 -lz" \
                        --logfile=$(BUILD_TMP)/Config-$(CST_FFMPEG_VERSION).log \
                        --cross-prefix=$(TARGET)- \
                        --prefix=$(TARGETPREFIX) \