sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

Disable the rust build by default

Browse Source 
Signed-off-by: David Mulder <dmulder@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
This commit is contained in:
David Mulder 2024-08-27 14:47:29 -06:00
parent 0998686355
commit 910a331f3e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildtools/wafsamba/samba_rust.py
View File

@ -5,12 +5,12 @@ import os
@conf
def SAMBA_CHECK_RUST(conf):
conf.find_program('cargo', var='CARGO',
mandatory=not conf.env.disable_rust)
mandatory=conf.env.enable_rust)
def vendor_sources(bld, enabled=True):
# force-disable when we can't build rust modules, so
# every single call doesn't need to pass this in.
if bld.env.disable_rust:
if not bld.env.enable_rust:
enabled = False
# Save time, no need to build rust when fuzzing
@ -48,7 +48,7 @@ def find_sources(source_dir, dep_crate):
def SAMBA_RUST(bld, rust_subdir, target_name, dep_crates=[], enabled=True):
# force-disable when we can't build rust modules, so
# every single call doesn't need to pass this in.
if bld.env.disable_rust:
if not bld.env.enable_rust:
enabled = False
# Save time, no need to build rust when fuzzing

8
buildtools/wafsamba/wscript
View File

@ -288,9 +288,9 @@ Currently the only tested value is 'smbtorture,smbd/smbd' for Samba'''),
opt.add_option('--disable-python',
help='do not generate python modules',
action='store_true', dest='disable_python', default=False)
opt.add_option('--disable-rust',
help='do not build rust modules',
action='store_true', dest='disable_rust', default=False)
opt.add_option('--enable-rust',
help='build rust modules',
action='store_true', dest='enable_rust', default=False)
@Utils.run_once
@ -354,7 +354,7 @@ def configure(conf):
conf.env.AUTOCONF_PROGRAM_PREFIX = Options.options.AUTOCONF_PROGRAM_PREFIX
conf.env.disable_python = Options.options.disable_python
conf.env.disable_rust = Options.options.disable_rust
conf.env.enable_rust = Options.options.enable_rust
if (conf.env.AUTOCONF_HOST and
conf.env.AUTOCONF_BUILD and

4
script/autobuild.py
View File

@ -313,7 +313,7 @@ tasks = {
"samba": {
"sequence": [
("random-sleep", random_sleep(300, 900)),
("configure", "./configure.developer --with-himmelblau" + samba_configure_params),
("configure", "./configure.developer --enable-rust --with-himmelblau" + samba_configure_params),
("make", "make -j"),
("test", make_test(exclude_envs=[
"none",
@ -818,7 +818,7 @@ tasks = {
"samba-o3": {
"sequence": [
("random-sleep", random_sleep(300, 900)),
("configure", "ADDITIONAL_CFLAGS='-O3 -Wp,-D_FORTIFY_SOURCE=2' ./configure.developer --abi-check-disable" + samba_configure_params),
("configure", "ADDITIONAL_CFLAGS='-O3 -Wp,-D_FORTIFY_SOURCE=2' ./configure.developer --abi-check-disable --enable-rust" + samba_configure_params),
("make", "make -j"),
("test", make_test(cmd='make test', TESTS="--exclude=selftest/slow-none", include_envs=["none"])),
("quicktest", make_test(cmd='make quicktest', include_envs=["ad_dc", "ad_dc_smb1", "ad_dc_smb1_done"])),