Add zlib

Author: bgrgicak

packages/php-wasm/compile/libcurl/Dockerfile

@@ -29,6 +29,8 @@ RUN CPPFLAGS="-I/root/lib/include " \
         --enable-https \
         --enable-http \
         --disable-pthreads \
-        --disable-threaded-resolver
+        --enable-websockets \
+        --disable-threaded-resolver \
+        --with-zlib=/root/lib
 
 RUN source /root/emsdk/emsdk_env.sh && EMCC_SKIP="-lc -lz -lcurl" EMCC_FLAGS="-sSIDE_MODULE" emmake make || true

packages/php-wasm/compile/libcurl/dist/root/lib/include/Makefile

@@ -213,9 +213,9 @@ CC = /root/emsdk/upstream/emscripten/emcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -Qunused-arguments -Os
 CFLAG_CURL_SYMBOL_HIDING = -fvisibility=hidden
-CONFIGURE_OPTIONS = " '--build' 'i386-pc-linux-gnu' '--target' 'wasm32-unknown-emscripten' '--prefix=/root/install/' '--disable-shared' '--enable-static' '--with-openssl' '--enable-https' '--enable-http' '--disable-pthreads' '--disable-threaded-resolver' 'build_alias=i386-pc-linux-gnu' 'target_alias=wasm32-unknown-emscripten' 'CC=/root/emsdk/upstream/emscripten/emcc'"
+CONFIGURE_OPTIONS = " '--build' 'i386-pc-linux-gnu' '--target' 'wasm32-unknown-emscripten' '--prefix=/root/install/' '--disable-shared' '--enable-static' '--with-openssl' '--enable-https' '--enable-http' '--disable-pthreads' '--enable-websockets' '--disable-threaded-resolver' '--with-zlib=/root/lib' 'build_alias=i386-pc-linux-gnu' 'target_alias=wasm32-unknown-emscripten' 'CC=/root/emsdk/upstream/emscripten/emcc'"
 CPP = /root/emsdk/upstream/emscripten/emcc -E
-CPPFLAGS = 
+CPPFLAGS = -I/root/lib/include
 CPPFLAG_CURL_STATICLIB = -DCURL_STATICLIB
 CURLVERSION = 7.69.1
 CURL_CA_BUNDLE = 
@@ -260,7 +260,7 @@ GREP = /usr/bin/grep
 HAVE_BROTLI = 
 HAVE_GNUTLS_SRP = 
 HAVE_LDAP_SSL = 1
-HAVE_LIBZ = 
+HAVE_LIBZ = 1
 HAVE_OPENSSL_SRP = 
 HAVE_PROTO_BSDSOCKET_H = 
 IDN_ENABLED = 
@@ -272,13 +272,13 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 IPV6_ENABLED = 
 LCOV = 
 LD = /root/emsdk/upstream/emscripten/emcc
-LDFLAGS = 
-LIBCURL_LIBS = 
+LDFLAGS = -L/root/lib/lib
+LIBCURL_LIBS = -lz
 LIBMETALINK_CPPFLAGS = 
 LIBMETALINK_LDFLAGS = 
 LIBMETALINK_LIBS = 
 LIBOBJS = 
-LIBS = 
+LIBS = -lz
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -320,7 +320,7 @@ SSL_BACKENDS =
 SSL_ENABLED = 
 SSL_LIBS = 
 STRIP = strip
-SUPPORT_FEATURES = UnixSockets
+SUPPORT_FEATURES = UnixSockets libz
 SUPPORT_PROTOCOLS = DICT FILE FTP GOPHER HTTP IMAP POP3 RTSP SMTP TELNET TFTP
 USE_ARES = 
 USE_BEARSSL = 
@@ -346,7 +346,7 @@ USE_WOLFSSH =
 USE_WOLFSSL = 
 VERSION = -
 VERSIONNUM = 074501
-ZLIB_LIBS = 
+ZLIB_LIBS = -lz
 ZSH_FUNCTIONS_DIR = ${prefix}/share/zsh/site-functions
 abs_builddir = /root/curl-7.69.1/include
 abs_srcdir = /root/curl-7.69.1/include

packages/php-wasm/compile/libcurl/dist/root/lib/include/curl/Makefile

@@ -200,9 +200,9 @@ CC = /root/emsdk/upstream/emscripten/emcc
 CCDEPMODE = depmode=gcc3
 CFLAGS = -Qunused-arguments -Os
 CFLAG_CURL_SYMBOL_HIDING = -fvisibility=hidden
-CONFIGURE_OPTIONS = " '--build' 'i386-pc-linux-gnu' '--target' 'wasm32-unknown-emscripten' '--prefix=/root/install/' '--disable-shared' '--enable-static' '--with-openssl' '--enable-https' '--enable-http' '--disable-pthreads' '--disable-threaded-resolver' 'build_alias=i386-pc-linux-gnu' 'target_alias=wasm32-unknown-emscripten' 'CC=/root/emsdk/upstream/emscripten/emcc'"
+CONFIGURE_OPTIONS = " '--build' 'i386-pc-linux-gnu' '--target' 'wasm32-unknown-emscripten' '--prefix=/root/install/' '--disable-shared' '--enable-static' '--with-openssl' '--enable-https' '--enable-http' '--disable-pthreads' '--enable-websockets' '--disable-threaded-resolver' '--with-zlib=/root/lib' 'build_alias=i386-pc-linux-gnu' 'target_alias=wasm32-unknown-emscripten' 'CC=/root/emsdk/upstream/emscripten/emcc'"
 CPP = /root/emsdk/upstream/emscripten/emcc -E
-CPPFLAGS = 
+CPPFLAGS = -I/root/lib/include
 CPPFLAG_CURL_STATICLIB = -DCURL_STATICLIB
 CURLVERSION = 7.69.1
 CURL_CA_BUNDLE = 
@@ -247,7 +247,7 @@ GREP = /usr/bin/grep
 HAVE_BROTLI = 
 HAVE_GNUTLS_SRP = 
 HAVE_LDAP_SSL = 1
-HAVE_LIBZ = 
+HAVE_LIBZ = 1
 HAVE_OPENSSL_SRP = 
 HAVE_PROTO_BSDSOCKET_H = 
 IDN_ENABLED = 
@@ -259,13 +259,13 @@ INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
 IPV6_ENABLED = 
 LCOV = 
 LD = /root/emsdk/upstream/emscripten/emcc
-LDFLAGS = 
-LIBCURL_LIBS = 
+LDFLAGS = -L/root/lib/lib
+LIBCURL_LIBS = -lz
 LIBMETALINK_CPPFLAGS = 
 LIBMETALINK_LDFLAGS = 
 LIBMETALINK_LIBS = 
 LIBOBJS = 
-LIBS = 
+LIBS = -lz
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LIPO = 
 LN_S = ln -s
@@ -307,7 +307,7 @@ SSL_BACKENDS =
 SSL_ENABLED = 
 SSL_LIBS = 
 STRIP = strip
-SUPPORT_FEATURES = UnixSockets
+SUPPORT_FEATURES = UnixSockets libz
 SUPPORT_PROTOCOLS = DICT FILE FTP GOPHER HTTP IMAP POP3 RTSP SMTP TELNET TFTP
 USE_ARES = 
 USE_BEARSSL = 
@@ -333,7 +333,7 @@ USE_WOLFSSH =
 USE_WOLFSSL = 
 VERSION = -
 VERSIONNUM = 074501
-ZLIB_LIBS = 
+ZLIB_LIBS = -lz
 ZSH_FUNCTIONS_DIR = ${prefix}/share/zsh/site-functions
 abs_builddir = /root/curl-7.69.1/include/curl
 abs_srcdir = /root/curl-7.69.1/include/curl

packages/php-wasm/compile/libcurl/dist/root/lib/lib/libcurl.a

@@ -17,7 +17,7 @@ old_library='libcurl.a'
 inherited_linker_flags=''
 
 # Libraries that this one depends upon.
-dependency_libs=''
+dependency_libs=' -L/root/lib/lib -lz'
 
 # Names of additional weak libraries provided by this library
 weak_library_names=''