From 4513acfee925eaebf27b1486561afe3afab0ffe4 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Fri, 11 Aug 2023 09:54:54 +0800
Subject: [PATCH] cos: use static libs for mxml, apr, apu, curl

---
 cmake/apr-util_CMakeLists.txt.in       | 2 +-
 cmake/apr_CMakeLists.txt.in            | 2 +-
 cmake/curl_CMakeLists.txt.in           | 2 +-
 cmake/mxml_CMakeLists.txt.in           | 2 +-
 contrib/CMakeLists.txt                 | 7 ++++---
 source/dnode/vnode/CMakeLists.txt      | 2 +-
 tests/parallel_test/container_build.sh | 4 ++--
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cmake/apr-util_CMakeLists.txt.in b/cmake/apr-util_CMakeLists.txt.in
index 6172be380e..d98a381005 100644
--- 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/ --with-apr=$ENV{HOME}/.cos-local
+        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1/ --with-apr=$ENV{HOME}/.cos-local
         #CONFIGURE_COMMAND ./configure --with-apr=/usr/local/apr
         BUILD_COMMAND make
         INSTALL_COMMAND make install
diff --git a/cmake/apr_CMakeLists.txt.in b/cmake/apr_CMakeLists.txt.in
index 538b45a7f9..18c4eb62a1 100644
--- a/cmake/apr_CMakeLists.txt.in
+++ b/cmake/apr_CMakeLists.txt.in
@@ -11,7 +11,7 @@ ExternalProject_Add(apr-1
         UPDATE_DISCONNECTED TRUE
         BUILD_ALWAYS 1
         #UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local/
+        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1/ --enable-shared=no
         #CONFIGURE_COMMAND ./configure
         BUILD_COMMAND make
         INSTALL_COMMAND make install
diff --git a/cmake/curl_CMakeLists.txt.in b/cmake/curl_CMakeLists.txt.in
index 1d9d028848..5f1efc1e5a 100644
--- 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 --without-ssl
+        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1 --without-ssl --enable-shared=no
         #CONFIGURE_COMMAND ./configure --without-ssl
         BUILD_COMMAND make
         INSTALL_COMMAND make install
diff --git a/cmake/mxml_CMakeLists.txt.in b/cmake/mxml_CMakeLists.txt.in
index 7377f81c33..9dcb5df665 100644
--- a/cmake/mxml_CMakeLists.txt.in
+++ b/cmake/mxml_CMakeLists.txt.in
@@ -6,7 +6,7 @@ ExternalProject_Add(mxml
         #BINARY_DIR ""
         BUILD_IN_SOURCE TRUE
         #UPDATE_COMMAND ""
-        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local --enable-shared=no
+        CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/.cos-local.1 --enable-shared=no
         #CONFIGURE_COMMAND ./configure
         BUILD_COMMAND make
         INSTALL_COMMAND make install
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index d20b205e69..452192a288 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -10,7 +10,7 @@ set(CONTRIB_TMP_FILE3 "${CMAKE_BINARY_DIR}/deps_tmp_CMakeLists.txt.in3")
 configure_file("${TD_SUPPORT_DIR}/deps_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
 
 if(${BUILD_WITH_COS})
-    file(MAKE_DIRECTORY $ENV{HOME}/.cos-local/)
+    file(MAKE_DIRECTORY $ENV{HOME}/.cos-local.1/)
     cat("${TD_SUPPORT_DIR}/mxml_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
     cat("${TD_SUPPORT_DIR}/apr_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
     cat("${TD_SUPPORT_DIR}/curl_CMakeLists.txt.in" ${CONTRIB_TMP_FILE3})
@@ -389,10 +389,11 @@ endif()
 # cos
 if(${BUILD_WITH_COS})
   if(NOT ${TD_WINDOWS})
-    set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local)
+    set(CMAKE_PREFIX_PATH $ENV{HOME}/.cos-local.1)
     #ADD_DEFINITIONS(-DMINIXML_LIBRARY=${CMAKE_BINARY_DIR}/build/lib/libxml.a)
     option(ENABLE_TEST "Enable the tests" OFF)
-    INCLUDE_DIRECTORIES($ENV{HOME}/.cos-local/include)
+    INCLUDE_DIRECTORIES($ENV{HOME}/.cos-local.1/include)
+    MESSAGE("$ENV{HOME}/.cos-local.1/include")
 
     set(CMAKE_BUILD_TYPE debug)
     set(ORIG_CMAKE_PROJECT_NAME ${CMAKE_PROJECT_NAME})
diff --git a/source/dnode/vnode/CMakeLists.txt b/source/dnode/vnode/CMakeLists.txt
index c036fbc54a..684134c2d6 100644
--- a/source/dnode/vnode/CMakeLists.txt
+++ b/source/dnode/vnode/CMakeLists.txt
@@ -196,7 +196,7 @@ include_directories (${APR_INCLUDE_DIR})
 target_include_directories(
   vnode
   PUBLIC "${TD_SOURCE_DIR}/contrib/cos-c-sdk-v5/cos_c_sdk"
-  PUBLIC "$ENV{HOME}/.cos-local/include"
+  PUBLIC "$ENV{HOME}/.cos-local.1/include"
   )
 
 if(${BUILD_TEST})
diff --git a/tests/parallel_test/container_build.sh b/tests/parallel_test/container_build.sh
index 62254984a9..f5e426057e 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:/root/.cos-local \
+    -v /root/.cos-local.1:/root/.cos-local.1 \
     -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:/root/.cos-local \
+    -v /root/.cos-local.1:/root/.cos-local.1 \
     -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 \
-- 
GitLab