From a5ccc3e8aa39f91a85931129dffc6aeea8e34767 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Wed, 9 Aug 2023 17:53:25 +0800
Subject: [PATCH] apr: make apr, apu, curl build always

---
 cmake/apr-util_CMakeLists.txt.in |  3 ++-
 cmake/apr_CMakeLists.txt.in      |  4 +++-
 cmake/curl_CMakeLists.txt.in     |  3 ++-
 cmake/mxml_CMakeLists.txt.in     |  2 +-
 contrib/CMakeLists.txt           | 15 ---------------
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/cmake/apr-util_CMakeLists.txt.in b/cmake/apr-util_CMakeLists.txt.in
index 1ae52c69af..c64e4ffcdb 100644
--- a/cmake/apr-util_CMakeLists.txt.in
+++ b/cmake/apr-util_CMakeLists.txt.in
@@ -9,7 +9,8 @@ ExternalProject_Add(aprutil-1
         SOURCE_DIR "${TD_CONTRIB_DIR}/apr-util"
         #BINARY_DIR ""
         BUILD_IN_SOURCE TRUE
-        UPDATE_COMMAND ""
+        BUILD_ALWAYS 1
+        #UPDATE_COMMAND ""
         CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local/ --with-apr=$ENV{HOME}/local
         #CONFIGURE_COMMAND ./configure --with-apr=/usr/local/apr
         BUILD_COMMAND make
diff --git a/cmake/apr_CMakeLists.txt.in b/cmake/apr_CMakeLists.txt.in
index 1df68919ae..bae8cfe0a6 100644
--- a/cmake/apr_CMakeLists.txt.in
+++ b/cmake/apr_CMakeLists.txt.in
@@ -8,7 +8,9 @@ ExternalProject_Add(apr-1
 	#GIT_TAG 1.5.2
         SOURCE_DIR "${TD_CONTRIB_DIR}/apr"
         BUILD_IN_SOURCE TRUE
-        UPDATE_COMMAND ""
+        UPDATE_DISCONNECTED TRUE
+        BUILD_ALWAYS 1
+        #UPDATE_COMMAND ""
         CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local/
         #CONFIGURE_COMMAND ./configure
         BUILD_COMMAND make
diff --git a/cmake/curl_CMakeLists.txt.in b/cmake/curl_CMakeLists.txt.in
index b09e85b9b2..27457ffdbc 100644
--- a/cmake/curl_CMakeLists.txt.in
+++ b/cmake/curl_CMakeLists.txt.in
@@ -7,7 +7,8 @@ ExternalProject_Add(curl
         #GIT_TAG curl-7_88_1
         SOURCE_DIR "${TD_CONTRIB_DIR}/curl"
         BUILD_IN_SOURCE TRUE
-        UPDATE_COMMAND ""
+        BUILD_ALWAYS 1
+        #UPDATE_COMMAND ""
         CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local --without-ssl
         #CONFIGURE_COMMAND ./configure --without-ssl
         BUILD_COMMAND make
diff --git a/cmake/mxml_CMakeLists.txt.in b/cmake/mxml_CMakeLists.txt.in
index 33dc48ab4e..f9b7e8e642 100644
--- a/cmake/mxml_CMakeLists.txt.in
+++ b/cmake/mxml_CMakeLists.txt.in
@@ -5,7 +5,7 @@ ExternalProject_Add(mxml
         SOURCE_DIR "${TD_CONTRIB_DIR}/mxml"
         #BINARY_DIR ""
         BUILD_IN_SOURCE TRUE
-        UPDATE_COMMAND ""
+        #UPDATE_COMMAND ""
         CONFIGURE_COMMAND ./configure --prefix=$ENV{HOME}/local
         #CONFIGURE_COMMAND ./configure
         BUILD_COMMAND make
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 9feefa6947..3fb7b93abe 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -162,21 +162,6 @@ if(${BUILD_GEOS})
     cat("${TD_SUPPORT_DIR}/geos_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
 endif()
 
-#    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unused-function")
-#    include(ExternalProject)
-#    ExternalProject_Add(mxml
-#        GIT_REPOSITORY https://github.com/michaelrsweet/mxml.git
-#	GIT_TAG release-2.10
-#        SOURCE_DIR "${TD_CONTRIB_DIR}/mxml"
-#        #BINARY_DIR ""
-#        BUILD_IN_SOURCE TRUE
-#        CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/build
-#        BUILD_COMMAND make
-#        INSTALL_COMMAND make install
-#        TEST_COMMAND ""
-#    )
-
-
 # download dependencies
 configure_file(${CONTRIB_TMP_FILE} "${TD_CONTRIB_DIR}/deps-download/CMakeLists.txt")
 execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .