From 5c64a730a9668f2768a13c9255f4a73e6b087046 Mon Sep 17 00:00:00 2001
From: xleili <xlli@taosdata.com>
Date: Fri, 2 Jun 2023 11:17:38 +0800
Subject: [PATCH] enchance: change goes as static link

---
 cmake/cmake.options        |  2 +-
 cmake/cmake.platform       | 10 ----------
 packaging/tools/makepkg.sh |  3 +++
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/cmake/cmake.options b/cmake/cmake.options
index b00ae14715..555b72cbdf 100644
--- a/cmake/cmake.options
+++ b/cmake/cmake.options
@@ -80,7 +80,7 @@ ENDIF ()
 option(
         BUILD_GEOS
         "If build geos on Windows"
-        OFF
+        ON
     )
 
 option(
diff --git a/cmake/cmake.platform b/cmake/cmake.platform
index f9faf7316c..ba747c6134 100644
--- a/cmake/cmake.platform
+++ b/cmake/cmake.platform
@@ -56,17 +56,7 @@ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin
 
         SET(TD_DARWIN TRUE)
         SET(OSTYPE "macOS")
-        execute_process(COMMAND geos-config --cflags OUTPUT_VARIABLE GEOS_CFLAGS)
-        execute_process(COMMAND geos-config --ldflags OUTPUT_VARIABLE GEOS_LDFLAGS)
-        string(SUBSTRING ${GEOS_CFLAGS} 2 -1 GEOS_CFLAGS)
-        string(REGEX REPLACE "\n" "" GEOS_CFLAGS ${GEOS_CFLAGS})
-        string(SUBSTRING ${GEOS_LDFLAGS} 2 -1 GEOS_LDFLAGS)
-        string(REGEX REPLACE "\n" "" GEOS_LDFLAGS ${GEOS_LDFLAGS})
-        MESSAGE("GEOS_CFLAGS "${GEOS_CFLAGS})
-        MESSAGE("GEOS_LDFLAGS "${GEOS_LDFLAGS})
         ADD_DEFINITIONS("-DDARWIN -Wno-tautological-pointer-compare")
-        INCLUDE_DIRECTORIES(${GEOS_CFLAGS})
-        LINK_DIRECTORIES(${GEOS_LDFLAGS})
 
         IF (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64")
             MESSAGE("Current system arch is arm64")
diff --git a/packaging/tools/makepkg.sh b/packaging/tools/makepkg.sh
index 2f1e803689..7cfd9aa664 100755
--- a/packaging/tools/makepkg.sh
+++ b/packaging/tools/makepkg.sh
@@ -112,9 +112,11 @@ fi
 if [ "$osType" == "Darwin" ]; then
     lib_files="${build_dir}/lib/libtaos.${version}.dylib"
     wslib_files="${build_dir}/lib/libtaosws.dylib"
+    rocksdb_lib_files="${build_dir}/lib/librocksdb.dylib.8.1.1"
 else
     lib_files="${build_dir}/lib/libtaos.so.${version}"
     wslib_files="${build_dir}/lib/libtaosws.so"
+    rocksdb_lib_files="${build_dir}/lib/librocksdb.so.8.1.1"
 fi
 header_files="${code_dir}/include/client/taos.h ${code_dir}/include/common/taosdef.h ${code_dir}/include/util/taoserror.h ${code_dir}/include/libs/function/taosudf.h"
 
@@ -337,6 +339,7 @@ fi
 # Copy driver
 mkdir -p ${install_dir}/driver && cp ${lib_files} ${install_dir}/driver && echo "${versionComp}" >${install_dir}/driver/vercomp.txt
 [ -f ${wslib_files} ] && cp ${wslib_files} ${install_dir}/driver || :
+[ -f ${rocksdb_lib_files} ] && cp ${rocksdb_lib_files} ${install_dir}/driver || :
 
 # Copy connector
 if [ "$verMode" == "cluster" ]; then
-- 
GitLab