Skip to content

Commit

Permalink
fix(rocksdb): force librocksdb.so* to be output into the directory `l…
Browse files Browse the repository at this point in the history
…ib` (#1804)

#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*.
  • Loading branch information
empiredan authored Dec 20, 2023
1 parent 8f38812 commit dec19d4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/workflows/lint_and_test_cpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ on:
- 'docker/thirdparties-bin/**'
- 'CMakeLists.txt'
- 'run.sh'
- 'scripts/pack_server.sh'
- 'scripts/pack_tools.sh'
- 'cmake_modules/**'
- 'src/**'
- 'thirdparty/**'
Expand Down
2 changes: 1 addition & 1 deletion scripts/pack_server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions thirdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dec19d4

Please sign in to comment.