From 9b93f8bbafc451892e4a3bc74ae81c21c0eedfa7 Mon Sep 17 00:00:00 2001
From: Feodor Alexandrov <feodor.alex.alexandrov@gmail.com>
Date: Wed, 13 Dec 2023 11:58:09 +0300
Subject: [PATCH] build: ldap and sasl dynamic linking
---
build.rs | 13 ++++++++-----
docker-build-base/Dockerfile | 4 +++-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/build.rs b/build.rs
index 9755961ce1..92c208ba7e 100644
--- a/build.rs
+++ b/build.rs
@@ -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
diff --git a/docker-build-base/Dockerfile b/docker-build-base/Dockerfile
index 82f29d7d5b..373eb64b47 100644
--- a/docker-build-base/Dockerfile
+++ b/docker-build-base/Dockerfile
@@ -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 | \
--
GitLab