From 320a4d61c4026616d9bece40d9d830e3362774c4 Mon Sep 17 00:00:00 2001 From: Sergei Politov Date: Sat, 26 Feb 2022 07:59:07 +0300 Subject: [PATCH] Correctly disable cyrus-sasl in openldap (#102) OpenLDAP uses cyrus-sasl by default. When Kerberos is installed on the build machine, cyrus-sasl would use it and OpenLDAP would depend on Kerberos libraries. Our Jenkins build machines do not have Kerberos, so the build fails if OpenLDAP depends on Kerberos. Here we correctly turn off cyrus-sasl for OpenLDAP build to avoid having this dependency. --- python/build_definitions/openldap.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/build_definitions/openldap.py b/python/build_definitions/openldap.py index 4af90ea0..4d603052 100644 --- a/python/build_definitions/openldap.py +++ b/python/build_definitions/openldap.py @@ -33,9 +33,10 @@ def get_additional_compiler_flags(self, builder: BuilderInterface) -> List[str]: def build(self, builder: BuilderInterface) -> None: # build client only disabled_features = ( - 'slapd', 'bdb', 'hdb', 'mdb', 'monitor', 'relay', 'syncprov', 'cyrus-sasl' + 'slapd', 'bdb', 'hdb', 'mdb', 'monitor', 'relay', 'syncprov' ) builder.build_with_configure( builder.log_prefix(self), - extra_args=['--disable-' + feature for feature in disabled_features]) + extra_args=['--disable-' + feature for feature in disabled_features] + + ['--with-cyrus-sasl=no'])