diff options
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 1 | ||||
| -rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 1 | ||||
| -rw-r--r-- | external/curl/zlib.patch.0 | 100 |
3 files changed, 102 insertions, 0 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index d6590c368193..bd03275d4888 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -60,6 +60,7 @@ $(call gb_ExternalProject_get_state_target,curl,build): $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ CPPFLAGS='$(curl_CPPFLAGS)' \ LDFLAGS='$(curl_LDFLAGS)' \ + ZLIB_CFLAGS='$(ZLIB_CFLAGS)' ZLIB_LIBS='$(ZLIB_LIBS)' \ && cd lib \ && $(MAKE) \ ) diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index 5eba91f73f17..b0d103204430 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\ external/curl/curl-msvc-disable-protocols.patch.1 \ external/curl/curl-msvc-schannel.patch.1 \ external/curl/curl-7.26.0_win-proxy.patch \ + external/curl/zlib.patch.0 \ )) ifeq ($(SYSTEM_NSS),) diff --git a/external/curl/zlib.patch.0 b/external/curl/zlib.patch.0 new file mode 100644 index 000000000000..87614c7703f7 --- /dev/null +++ b/external/curl/zlib.patch.0 @@ -0,0 +1,100 @@ +--- configure ++++ configure +@@ -937,8 +937,8 @@ + ZLIB_LIBS + HAVE_LIBZ_FALSE + HAVE_LIBZ_TRUE +-HAVE_LIBZ + PKGCONFIG ++HAVE_LIBZ + CURL_DISABLE_GOPHER + CURL_DISABLE_SMTP + CURL_DISABLE_SMB +@@ -20709,7 +20709,6 @@ + clean_CPPFLAGS=$CPPFLAGS + clean_LDFLAGS=$LDFLAGS + clean_LIBS=$LIBS +-ZLIB_LIBS="" + + # Check whether --with-zlib was given. + if test "${with_zlib+set}" = set; then : +@@ -20718,6 +20719,7 @@ + + + if test "$OPT_ZLIB" = "no" ; then ++ ZLIB_LIBS="" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5 + $as_echo "$as_me: WARNING: zlib disabled" >&2;} + else +@@ -20725,6 +20725,21 @@ + OPT_ZLIB="" + fi + ++ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then ++ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS" ++ LIBS="$ZLIB_LIBS $LIBS" ++ HAVE_LIBZ="1" ++ ++ ++$as_echo "#define HAVE_ZLIB_H 1" >>confdefs.h ++ ++ ++$as_echo "#define HAVE_LIBZ 1" >>confdefs.h ++ ++ AMFIXLIB="1" ++ else ++ ZLIB_LIBS="" ++ + + if test -n "$PKG_CONFIG"; then + PKGCONFIG="$PKG_CONFIG" +@@ -21005,6 +21020,7 @@ + $as_echo "$as_me: found both libz and libz.h header" >&6;} + curl_zlib_msg="enabled" + fi ++ fi + fi + + if test x"$AMFIXLIB" = x1; then +--- configure.ac ++++ configure.ac +@@ -880,19 +880,30 @@ + clean_CPPFLAGS=$CPPFLAGS + clean_LDFLAGS=$LDFLAGS + clean_LIBS=$LIBS +-ZLIB_LIBS="" + AC_ARG_WITH(zlib, + AC_HELP_STRING([--with-zlib=PATH],[search for zlib in PATH]) + AC_HELP_STRING([--without-zlib],[disable use of zlib]), + [OPT_ZLIB="$withval"]) + + if test "$OPT_ZLIB" = "no" ; then ++ ZLIB_LIBS="" + AC_MSG_WARN([zlib disabled]) + else + if test "$OPT_ZLIB" = "yes" ; then + OPT_ZLIB="" + fi + ++ if test -n "$ZLIB_CFLAGS$ZLIB_LIBS"; then ++ CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS" ++ LIBS="$ZLIB_LIBS $LIBS" ++ HAVE_LIBZ="1" ++ AC_SUBST(HAVE_LIBZ) ++ AC_DEFINE(HAVE_ZLIB_H, 1, [if you have the zlib.h header file]) ++ AC_DEFINE(HAVE_LIBZ, 1, [if zlib is available]) ++ AMFIXLIB="1" ++ else ++ ZLIB_LIBS="" ++ + CURL_CHECK_PKGCONFIG(zlib) + + if test "$PKGCONFIG" != "no" ; then +@@ -975,6 +986,7 @@ + AC_MSG_NOTICE([found both libz and libz.h header]) + curl_zlib_msg="enabled" + fi ++ fi + fi + + dnl set variable for use in automakefile(s) |