From 7fdf6cc696fae234f993479f5737451a384cfda3 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Tue, 24 Oct 2023 09:04:24 +0800
Subject: [PATCH] cmake: use new dir for libs3

---
 cmake/curl_CMakeLists.txt.in           |  7 ++-----
 cmake/libs3.GNUmakefile                |  2 +-
 cmake/libs3_CMakeLists.txt.in          | 15 +--------------
 cmake/ssl_CMakeLists.txt.in            |  2 +-
 contrib/CMakeLists.txt                 |  4 ++--
 source/dnode/vnode/CMakeLists.txt      |  8 ++++----
 tests/parallel_test/container_build.sh |  4 ++--
 7 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/cmake/curl_CMakeLists.txt.in b/cmake/curl_CMakeLists.txt.in
index b013ed1807..140fc48103 100644
--- a/cmake/curl_CMakeLists.txt.in
+++ b/cmake/curl_CMakeLists.txt.in
@@ -10,11 +10,8 @@ ExternalProject_Add(curl
         DEPENDS openssl
         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 --without-zstd
-        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1 --with-ssl=$ENV{HOME}/.cos-local.1  --enable-shared=no --disable-ldap --disable-ldaps --without-brotli --without-zstd --without-libidn2 #--enable-debug
-
-        #CONFIGURE_COMMAND ./configure --without-ssl
+        UPDATE_COMMAND ""
+        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.2 --with-ssl=$ENV{HOME}/.cos-local.2  --enable-shared=no --disable-ldap --disable-ldaps --without-brotli --without-zstd --without-libidn2 #--enable-debug
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install
         TEST_COMMAND ""
diff --git a/cmake/libs3.GNUmakefile b/cmake/libs3.GNUmakefile
index abf954f5c1..98f98d8224 100644
--- a/cmake/libs3.GNUmakefile
+++ b/cmake/libs3.GNUmakefile
@@ -91,7 +91,7 @@ endif
 # --------------------------------------------------------------------------
 # DESTDIR directory
 ifndef DESTDIR
-    DESTDIR := ${HOME}/.cos-local.1
+    DESTDIR := ${HOME}/.cos-local.2
 endif
 
 # --------------------------------------------------------------------------
diff --git a/cmake/libs3_CMakeLists.txt.in b/cmake/libs3_CMakeLists.txt.in
index b2d2d19059..b5e9c438e6 100644
--- a/cmake/libs3_CMakeLists.txt.in
+++ b/cmake/libs3_CMakeLists.txt.in
@@ -1,15 +1,5 @@
 # libs3
 
-set(s3_flags "${CMAKE_C_FLAGS} -O3 -Iinc -I$ENV{HOME}/.cos-local.1/include -Iinc ")
-
-set(SED_CMD "s/CFLAGS += -Wall -Werror/CFLAGS += -I$ENV{HOME}/.cos-local.1/include /")
-
-function(update_cflags)
-    file(READ "GNUmakefile" S3_CONTENT)
-    string(REPLACE "CFLAGS += -Wall -Werror" "CFLAGS += -I$ENV{HOME}/.cos-local.1/include " S3_CONTENT "${S3_CONTENT}")
-    file(WRITE "GNUmakefile" "${S3_CONTENT}")
-endfunction(update_cflags)
-
 ExternalProject_Add(libs3
         GIT_REPOSITORY https://github.com/bji/libs3
         #GIT_TAG v5.0.16
@@ -19,10 +9,7 @@ ExternalProject_Add(libs3
         BUILD_IN_SOURCE TRUE
         BUILD_ALWAYS 1
 	UPDATE_COMMAND ""
-	#sed_cmd "s/CFLAGS += -Wall -Werror/CFLAGS += -I$ENV{HOME}/.cos-local.1/include /"
-	CONFIGURE_COMMAND cp ${TD_SUPPORT_DIR}/libs3.GNUmakefile GNUmakefile &&  sed -i "s|CFLAGS += -Wall -Werror|CFLAGS += -I'$ENV{HOME}/.cos-local.1/include' -L'$ENV{HOME}/.cos-local.1/lib' |" ./GNUmakefile
-        #BUILD_COMMAND make CFLAGS=${s3_flags} DESTDIR=$ENV{HOME}/.cos-local.1 build/lib/libs3.a
-        #BUILD_COMMAND make DESTDIR="$ENV{HOME}/.cos-local.1" build/lib/libs3.a
+	CONFIGURE_COMMAND cp ${TD_SUPPORT_DIR}/libs3.GNUmakefile GNUmakefile &&  sed -i "s|CFLAGS += -Wall -Werror|CFLAGS += -I'$ENV{HOME}/.cos-local.2/include' -L'$ENV{HOME}/.cos-local.2/lib' |" ./GNUmakefile
         BUILD_COMMAND make build/lib/libs3.a
         INSTALL_COMMAND make install_static
         TEST_COMMAND ""
diff --git a/cmake/ssl_CMakeLists.txt.in b/cmake/ssl_CMakeLists.txt.in
index 1f3fd0a30d..c9f836bade 100644
--- a/cmake/ssl_CMakeLists.txt.in
+++ b/cmake/ssl_CMakeLists.txt.in
@@ -8,7 +8,7 @@ ExternalProject_Add(openssl
         BUILD_IN_SOURCE TRUE
         #BUILD_ALWAYS 1
         #UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./Configure --prefix=$ENV{HOME}/.cos-local.1 -static #--no-shared
+        CONFIGURE_COMMAND ./Configure --prefix=$ENV{HOME}/.cos-local.2 -static #--no-shared
         BUILD_COMMAND make -j
         INSTALL_COMMAND make install_sw -j
         TEST_COMMAND ""
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 013269c583..e2a5378f0d 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -9,7 +9,7 @@ endfunction(cat IN_FILE OUT_FILE)
 if(${TD_LINUX})
 
 if(${BUILD_WITH_S3})
-    file(MAKE_DIRECTORY $ENV{HOME}/.cos-local.1/)
+    file(MAKE_DIRECTORY $ENV{HOME}/.cos-local.2/)
 
 else()
 
@@ -414,7 +414,7 @@ if (${BUILD_WITH_ROCKSDB})
 endif()
 
 if(${BUILD_WITH_S3})
-    INCLUDE_DIRECTORIES($ENV{HOME}/.cos-local.1/include)
+    INCLUDE_DIRECTORIES($ENV{HOME}/.cos-local.2/include)
     MESSAGE("build with s3: ${BUILD_WITH_S3}")
 
 else()
diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt
index 7e2693e8af..bc93ab575e 100644
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -167,15 +167,15 @@ if(${BUILD_WITH_S3})
   target_include_directories(
     vnode
 
-    PUBLIC "$ENV{HOME}/.cos-local.1/include"
+    PUBLIC "$ENV{HOME}/.cos-local.2/include"
     )
 
   set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-  set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.1)
+  set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.2)
   find_library(S3_LIBRARY s3)
   find_library(CURL_LIBRARY curl)
-  find_library(SSL_LIBRARY ssl PATHS $ENV{HOME}/.cos-local.1/lib64)
-  find_library(CRYPTO_LIBRARY crypto PATHS $ENV{HOME}/.cos-local.1/lib64)
+  find_library(SSL_LIBRARY ssl PATHS $ENV{HOME}/.cos-local.2/lib64)
+  find_library(CRYPTO_LIBRARY crypto PATHS $ENV{HOME}/.cos-local.2/lib64)
   target_link_libraries(
     vnode
 
diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh
index f5e426057e..94704b1c25 100755
--- a/tests/parallel_test/container_build.sh
+++ b/tests/parallel_test/container_build.sh
@@ -60,7 +60,7 @@ docker run \
     -v /root/.cargo/git:/root/.cargo/git \
     -v /root/go/pkg/mod:/root/go/pkg/mod \
     -v /root/.cache/go-build:/root/.cache/go-build \
-    -v /root/.cos-local.1:/root/.cos-local.1 \
+    -v /root/.cos-local.1:/root/.cos-local.2 \
     -v ${REP_REAL_PATH}/enterprise/src/plugins/taosx/target:${REP_DIR}/enterprise/src/plugins/taosx/target \
     -v ${REP_REAL_PATH}/community/tools/taosws-rs/target:${REP_DIR}/community/tools/taosws-rs/target \
     -v ${REP_REAL_PATH}/community/contrib/cJson/:${REP_DIR}/community/contrib/cJson \
@@ -89,7 +89,7 @@ docker run \
     -v /root/.cargo/git:/root/.cargo/git \
     -v /root/go/pkg/mod:/root/go/pkg/mod \
     -v /root/.cache/go-build:/root/.cache/go-build \
-    -v /root/.cos-local.1:/root/.cos-local.1 \
+    -v /root/.cos-local.1:/root/.cos-local.2 \
     -v ${REP_REAL_PATH}/enterprise/src/plugins/taosx/target:${REP_DIR}/enterprise/src/plugins/taosx/target \
     -v ${REP_REAL_PATH}/community/tools/taosws-rs/target:${REP_DIR}/community/tools/taosws-rs/target \
     -v ${REP_REAL_PATH}/community/contrib/cJson/:${REP_DIR}/community/contrib/cJson \