diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c568b64..9a426e30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -146,7 +146,7 @@ if (APPLE) FIND_PACKAGE(ngHTTP2 REQUIRED) set(CURL_LIBRARIES ${NGHTTP2_LIBRARIES} ${CURL_LIBRARIES}) # nghttp2 was not being statically built set(SYSTEM_LIBS "-framework CoreFoundation" "-framework CoreGraphics" "-framework CoreData" - "-framework CoreText" "-framework Security" "-framework Foundation" + "-framework SystemConfiguration" "-framework CoreText" "-framework Security" "-framework Foundation" "-Wl,-U,_MallocExtension_ReleaseFreeMemory" "-Wl,-U,_ProfilerStart" "-Wl,-U,_ProfilerStop") else() set(STD_LIB -static-libgcc -static-libstdc++) diff --git a/docker/development.Dockerfile b/docker/development.Dockerfile index 7c5bf577..4b17601a 100644 --- a/docker/development.Dockerfile +++ b/docker/development.Dockerfile @@ -44,9 +44,9 @@ RUN make -C /opt/openssl-1.1.1d depend RUN make -C /opt/openssl-1.1.1d -j8 RUN make -C /opt/openssl-1.1.1d install -ADD https://github.com/curl/curl/releases/download/curl-7_65_3/curl-7.65.3.tar.gz /opt/curl-7.65.3.tar.gz -RUN tar -C /opt -xf /opt/curl-7.65.3.tar.gz -RUN cd /opt/curl-7.65.3 && LIBS="-ldl -lpthread" ./configure --disable-shared --with-ssl=/usr/local \ +ADD https://github.com/curl/curl/releases/download/curl-7_78_0/curl-7.78.0.tar.gz /opt/curl-7.78.0.tar.gz +RUN tar -C /opt -xf /opt/curl-7.78.0.tar.gz +RUN cd /opt/curl-7.78.0 && LIBS="-ldl -lpthread" ./configure --disable-shared --with-ssl=/usr/local \ --without-ca-bundle --without-ca-path && make -j8 && make install && rm -rf /usr/local/lib/*.so* ADD https://github.com/gflags/gflags/archive/v2.2.2.tar.gz /opt/gflags-2.2.2.tar.gz