Merge pull request #22516 from taosdata/fix/TD-25010-8

fix(s3): cmake apu & curl fixes

Merge pull request #22516 from taosdata/fix/TD-25010-8
fix(s3): cmake apu & curl fixes
53e34105 · wade zhang · GitHub · 21196a97 · 2c1a46a3 · 53e34105
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

cmake/apr-util_CMakeLists.txt.in cmake/apr-util_CMakeLists.txt.in +1 -1

cmake/curl_CMakeLists.txt.in cmake/curl_CMakeLists.txt.in +1 -1

未找到文件。
--- a/cmake/apr-util_CMakeLists.txt.in
+++ b/cmake/apr-util_CMakeLists.txt.in
@@ -11,7 +11,7 @@ ExternalProject_Add(aprutil-1
        BUILD_IN_SOURCE TRUE
        BUILD_ALWAYS 1
        #UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1/ --with-apr=$ENV{HOME}/.cos-local.1
+        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1/ --with-apr=$ENV{HOME}/.cos-local.1 --without-expat
        #CONFIGURE_COMMAND ./configure --with-apr=/usr/local/apr
        BUILD_COMMAND make
        INSTALL_COMMAND make install

--- a/cmake/curl_CMakeLists.txt.in
+++ b/cmake/curl_CMakeLists.txt.in
@@ -9,7 +9,7 @@ ExternalProject_Add(curl
        BUILD_IN_SOURCE TRUE
        BUILD_ALWAYS 1
        #UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1 --without-ssl --enable-shared=no --disable-ldap --disable-ldaps --without-brotli
+        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1 --without-ssl --enable-shared=no --disable-ldap --disable-ldaps --without-brotli --without-zstd
        #CONFIGURE_COMMAND ./configure --without-ssl
        BUILD_COMMAND make
        INSTALL_COMMAND make install