From cc021699a84bf9b109731e9bde2e426f054f738a Mon Sep 17 00:00:00 2001 From: afwerar <1296468573@qq.com> Date: Sat, 14 May 2022 20:34:59 +0800 Subject: [PATCH] fix(os): make tdb lib to static --- packaging/release.sh | 1 - packaging/tools/install.sh | 6 ------ source/libs/tdb/CMakeLists.txt | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/packaging/release.sh b/packaging/release.sh index ef3018a913..9230cafa85 100755 --- a/packaging/release.sh +++ b/packaging/release.sh @@ -67,7 +67,6 @@ bin_files="${compile_dir}/build/bin/taosd ${compile_dir}/build/bin/taos ${compi cp -rf ${bin_files} ${install_dir}/bin && chmod a+x ${install_dir}/bin/* || : cp ${compile_dir}/build/lib/libtaos.so ${install_dir}/lib/ -cp ${compile_dir}/build/lib/libtdb.so ${install_dir}/lib/ cp ${compile_dir}/build/lib/libavro* ${install_dir}/lib/ > /dev/null || echo -e "failed to copy avro libraries" cp -rf ${compile_dir}/build/lib/pkgconfig ${install_dir}/lib/ > /dev/null || echo -e "failed to copy pkgconfig directory" diff --git a/packaging/tools/install.sh b/packaging/tools/install.sh index 740d356f80..d2d52af955 100755 --- a/packaging/tools/install.sh +++ b/packaging/tools/install.sh @@ -215,15 +215,9 @@ function install_lib() { ${csudo} ln -s ${install_main_dir}/lib/libtaos.* ${lib_link_dir}/libtaos.so.1 ${csudo} ln -s ${lib_link_dir}/libtaos.so.1 ${lib_link_dir}/libtaos.so - ${csudo} ln -s ${install_main_dir}/lib/libtdb.* ${lib_link_dir}/libtdb.so.1 - ${csudo} ln -s ${lib_link_dir}/libtdb.so.1 ${lib_link_dir}/libtdb.so - if [[ -d ${lib64_link_dir} && ! -e ${lib64_link_dir}/libtaos.so ]]; then ${csudo} ln -s ${install_main_dir}/lib/libtaos.* ${lib64_link_dir}/libtaos.so.1 || : ${csudo} ln -s ${lib64_link_dir}/libtaos.so.1 ${lib64_link_dir}/libtaos.so || : - - ${csudo} ln -s ${install_main_dir}/lib/libtdb.* ${lib64_link_dir}/libtdb.so.1 || : - ${csudo} ln -s ${lib64_link_dir}/libtdb.so.1 ${lib64_link_dir}/libtdb.so || : fi ${csudo} ldconfig diff --git a/source/libs/tdb/CMakeLists.txt b/source/libs/tdb/CMakeLists.txt index 722f6bddef..01490030f2 100644 --- a/source/libs/tdb/CMakeLists.txt +++ b/source/libs/tdb/CMakeLists.txt @@ -1,5 +1,5 @@ # tdb -add_library(tdb SHARED "") +add_library(tdb STATIC "") target_sources(tdb PRIVATE "src/db/tdbPCache.c" -- GitLab