diff --git a/.github/workflows/Dockerfile.jammy b/.github/workflows/Dockerfile.jammy index 1dd63369c2..c0942932bb 100644 --- a/.github/workflows/Dockerfile.jammy +++ b/.github/workflows/Dockerfile.jammy @@ -16,8 +16,10 @@ RUN apt update && \ apt install -y --no-install-recommends \ git cmake make g++ lld gperf netcat \ python3.7 python3-pip python3.7-distutils python3.7-dev libpython3.7-dev python3-jsonschema python3-setuptools mysql-server libmysqlclient-dev && \ + wget https://github.com/curl/curl/releases/download/curl-8_4_0/curl-8.4.0.zip && unzip curl-8.4.0.zip && cd curl-8.4.0 && ./configure --disable-shared --with-openssl --disable-lpad --disable-ldaps && make -j$(nproc) && make install && cd .. && \ + mkdir /opt/curl840 && mkdir /opt/curl840/lib && mkdir /opt/curl840/include && cp /usr/local/lib/libcurl.a /opt/curl840/lib/ && cp -R /usr/local/include/curl/ /opt/curl840/include/ && \ python3.7 -m pip install pip && python3.7 -m pip install -r /tmp/requirements.txt && \ - apt install -y --no-install-recommends curl-kphp-vk kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \ + apt install -y --no-install-recommends kphp-timelib libuber-h3-dev libfmt-dev libgtest-dev libgmock-dev libre2-dev libpcre3-dev \ libzstd-dev libyaml-cpp-dev libnghttp2-dev zlib1g-dev php7.4-dev libnuma-dev unzip \ libldap-dev libkrb5-dev postgresql postgresql-server-dev-all && \ rm -rf /var/lib/apt/lists/* diff --git a/cmake/init-global-vars.cmake b/cmake/init-global-vars.cmake index e9787f5b8f..f56dc3f267 100644 --- a/cmake/init-global-vars.cmake +++ b/cmake/init-global-vars.cmake @@ -11,7 +11,7 @@ if(APPLE) set(CURL_LIB curl) set(ICONV_LIB iconv) else() - set(CURL_LIB /opt/curl7600/lib/libcurl.a) + set(CURL_LIB /opt/curl840/lib/libcurl.a) set(RT_LIB rt) set(NUMA_LIB numa) endif() diff --git a/compiler/compiler-settings.cpp b/compiler/compiler-settings.cpp index 66058f47f1..2b2019df7b 100644 --- a/compiler/compiler-settings.cpp +++ b/compiler/compiler-settings.cpp @@ -132,7 +132,7 @@ void append_curl(std::string &cxx_flags, std::string &ld_flags) noexcept { ld_flags += " -lcurl"; #else // TODO make it as an option? - const std::string curl_dir = "/opt/curl7600"; + const std::string curl_dir = "/opt/curl840"; cxx_flags += " -I" + curl_dir + "/include/"; ld_flags += " " + curl_dir + "/lib/libcurl.a"; #endif diff --git a/runtime/runtime.cmake b/runtime/runtime.cmake index 7bfc8d802f..b0558dc48f 100644 --- a/runtime/runtime.cmake +++ b/runtime/runtime.cmake @@ -143,7 +143,7 @@ allow_deprecated_declarations(${BASE_DIR}/runtime/allocator.cpp ${BASE_DIR}/runt allow_deprecated_declarations_for_apple(${BASE_DIR}/runtime/inter-process-mutex.cpp) vk_add_library(kphp_runtime OBJECT ${KPHP_RUNTIME_ALL_SOURCES}) -target_include_directories(kphp_runtime PUBLIC ${BASE_DIR} /opt/curl7600/include) +target_include_directories(kphp_runtime PUBLIC ${BASE_DIR} /opt/curl840/include) add_dependencies(kphp_runtime kphp-timelib)