From: David Mulder Date: Thu, 29 Aug 2024 17:22:59 +0000 (-0600) Subject: autobuild: Only enable rust build if cargo exists X-Git-Tag: tdb-1.4.13~869 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24710a5f4e5c7a08280751c5d5221609a47b0206;p=thirdparty%2Fsamba.git autobuild: Only enable rust build if cargo exists We need to do this to prevent CI systems which are missing cargo (Debian) from attempting to configure with Rust. Signed-off-by: David Mulder Reviewed-by: Alexander Bokovoy --- diff --git a/script/autobuild.py b/script/autobuild.py index 972bf127a6e..c2c8d742f23 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -19,6 +19,7 @@ from email.mime.multipart import MIMEMultipart from sysconfig import get_path import platform import ssl +import shutil def get_libc_version(): import ctypes @@ -177,12 +178,13 @@ builddirs = { ctdb_configure_params = " --enable-developer ${PREFIX}" samba_configure_params = " ${ENABLE_COVERAGE} ${PREFIX} --with-profiling-data" -# We cannot configure himmelblau on old systems missing openssl 3 or with glibc -# older than version 2.32. +# We cannot configure himmelblau on old systems missing openssl 3, with glibc +# older than version 2.32, or when cargo isn't available. himmelblau_configure_params = '' rust_configure_param = '' glibc_vers = float('.'.join(get_libc_version().split('.')[:2])) -if glibc_vers >= 2.32: +cargo = shutil.which('cargo') +if glibc_vers >= 2.32 and cargo != None: rust_configure_param = ' --enable-rust' if ssl.OPENSSL_VERSION_INFO[0] >= 3 and rust_configure_param: himmelblau_configure_params = rust_configure_param + ' --with-himmelblau'