disable using zlib in mbedtls, libssh2, and libcurl

since it requires additional dev headers fix #18101
JuliaLang · Aug 20, 2016 · f714e83 · f714e83
1 parent d14f169
commit f714e83
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/deps/curl.mk b/deps/curl.mk
@@ -17,7 +17,7 @@ $(BUILDDIR)/curl-$(CURL_VER)/config.status: $(SRCDIR)/srccache/curl-$(CURL_VER)/
 	mkdir -p $(dir $@)
 	cd $(dir $@) && \
 	$< $(CONFIGURE_COMMON) --includedir=$(build_includedir) \
-		--without-ssl --without-gnutls --without-gssapi \
+		--without-ssl --without-gnutls --without-gssapi --without-zlib \
 		--without-libidn --without-libmetalink --without-librtmp \
 		--without-nghttp2 --without-nss --without-polarssl \
 		--without-spnego --without-libpsl --disable-ares \

diff --git a/deps/libssh2.mk b/deps/libssh2.mk
@@ -16,7 +16,7 @@ ifeq ($(BUILD_OS),WINNT)
 LIBSSH2_OPTS += -G"MSYS Makefiles"
 endif
 else
-LIBSSH2_OPTS += -DCRYPTO_BACKEND=mbedTLS -DENABLE_ZLIB_COMPRESSION=ON
+LIBSSH2_OPTS += -DCRYPTO_BACKEND=mbedTLS -DENABLE_ZLIB_COMPRESSION=OFF
 endif
 
 ifeq ($(OS),Linux)

diff --git a/deps/mbedtls.mk b/deps/mbedtls.mk
@@ -13,14 +13,10 @@ MBEDTLS_OBJ_TARGET := $(build_shlibdir)/libmbedcrypto.$(SHLIB_EXT)
 MBEDTLS_OPTS := $(CMAKE_COMMON) -DUSE_SHARED_MBEDTLS_LIBRARY=ON \
 		-DENABLE_PROGRAMS=OFF -DCMAKE_BUILD_TYPE=Release
 
-ifeq ($(OS),WINNT)
 MBEDTLS_OPTS += -DENABLE_ZLIB_SUPPORT=OFF
 ifeq ($(BUILD_OS),WINNT)
 MBEDTLS_OPTS += -G"MSYS Makefiles"
 endif
-else
-MBEDTLS_OPTS += -DENABLE_ZLIB_SUPPORT=ON
-endif
 
 ifeq ($(OS),Linux)
 MBEDTLS_OPTS += -DCMAKE_INSTALL_RPATH="\$$ORIGIN"