Skip to content
Snippets Groups Projects
Commit 9b93f8bb authored by Feodor Alexandrov's avatar Feodor Alexandrov
Browse files

build: ldap and sasl dynamic linking

parent 97b68604
No related branches found
No related tags found
No related merge requests found
......@@ -213,6 +213,7 @@ fn build_tarantool(jsc: Option<&jobserver::Client>, build_root: &Path) {
.arg(concat!(
"-DCMAKE_TARANTOOL_ARGS=",
"-DCMAKE_BUILD_TYPE=RelWithDebInfo;",
"-DENABLE_BUNDLED_LDAP=OFF",
"-DBUILD_TESTING=FALSE;",
"-DBUILD_DOC=FALSE",
))
......@@ -300,11 +301,13 @@ fn build_tarantool(jsc: Option<&jobserver::Client>, build_root: &Path) {
rustc::link_lib_dynamic("zstd");
// Add LDAP authentication support libraries.
rustc::link_search(format!("{tarantool_build}/bundled-ldap-prefix/lib"));
rustc::link_lib_static_no_whole_archive("ldap");
rustc::link_lib_static_no_whole_archive("lber");
rustc::link_search(format!("{tarantool_build}/bundled-sasl-prefix/lib"));
rustc::link_lib_static_no_whole_archive("sasl2");
// rustc::link_search(format!("{tarantool_build}/bundled-ldap-prefix/lib"));
// rustc::link_lib_static_no_whole_archive("ldap");
// rustc::link_lib_static_no_whole_archive("lber");
// rustc::link_search(format!("{tarantool_build}/bundled-sasl-prefix/lib"));
// rustc::link_lib_static_no_whole_archive("sasl2");
rustc::link_lib_dynamic("sasl2");
rustc::link_lib_dynamic("ldap");
if cfg!(target_os = "macos") {
// Currently we link against 2 versions of `decNumber` library: one
......
......@@ -17,7 +17,9 @@ RUN set -e; \
libssl-dev \
ncurses-dev \
libreadline-dev \
libicu-dev
libicu-dev \
libsasl2-dev \
libldap2-dev
RUN set -e; \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment