This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new dec19d4b8 fix(rocksdb): force librocksdb.so* to be output into the
directory `lib` (#1804)
dec19d4b8 is described below
commit dec19d4b8dc682f705574a142be0c8a853e45c77
Author: Dan Wang <[email protected]>
AuthorDate: Wed Dec 20 19:33:46 2023 +0800
fix(rocksdb): force librocksdb.so* to be output into the directory `lib`
(#1804)
https://github.com/apache/incubator-pegasus/issues/1805
After building was finished, sometimes librocksdb.so* would be output into
the directory `lib64` rather than `lib`, which would lead to an error that
librocksdb.so* could not be found while packing server.
To solve this problem, just specify the output dir for librocksdb.so*.
---
.github/workflows/lint_and_test_cpp.yaml | 2 ++
scripts/pack_server.sh | 2 +-
thirdparty/CMakeLists.txt | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/lint_and_test_cpp.yaml
b/.github/workflows/lint_and_test_cpp.yaml
index 85b8eeb09..852c83c19 100644
--- a/.github/workflows/lint_and_test_cpp.yaml
+++ b/.github/workflows/lint_and_test_cpp.yaml
@@ -39,6 +39,8 @@ on:
- 'docker/thirdparties-bin/**'
- 'CMakeLists.txt'
- 'run.sh'
+ - 'scripts/pack_server.sh'
+ - 'scripts/pack_tools.sh'
- 'cmake_modules/**'
- 'src/**'
- 'thirdparty/**'
diff --git a/scripts/pack_server.sh b/scripts/pack_server.sh
index b358133c1..2944d975d 100755
--- a/scripts/pack_server.sh
+++ b/scripts/pack_server.sh
@@ -124,7 +124,7 @@ fi
copy_file ./thirdparty/output/lib/libboost*.so.1.69.0 ${pack}/bin
copy_file ./thirdparty/output/lib/libhdfs* ${pack}/bin
-copy_file ./thirdparty/output/lib64/librocksdb.so.8 ${pack}/bin
+copy_file ./thirdparty/output/lib/librocksdb.so.8 ${pack}/bin
copy_file ./scripts/sendmail.sh ${pack}/bin
copy_file ./src/server/config.ini ${pack}/bin
copy_file ./src/server/config.min.ini ${pack}/bin
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 6b162697d..fb628986a 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -454,6 +454,7 @@ set(ROCKSDB_OPTIONS
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_INSTALL_PREFIX=${TP_OUTPUT}
+ -DCMAKE_INSTALL_LIBDIR=lib
-DPORTABLE=${ROCKSDB_PORTABLE})
# Link error on MacOS, disable building encfs plugin.
# See https://github.com/pegasus-kv/encfs/issues/4
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
