./configure --disable-containers now skip containers build. ./configure --container-command "/path/to/docker" can be used to override autodetection.
Signed-off-by: Pierrick Bouvier <[email protected]> --- configure | 11 +++-------- meson_options.txt | 4 ++++ tests/tcg/meson.build | 21 +++++++++++++++++---- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 06af81e18f6..568de41dadd 100755 --- a/configure +++ b/configure @@ -172,7 +172,6 @@ fi # some defaults, based on the host environment # default parameters -container_command="" cpu="" cross_compile="no" cross_prefix="" @@ -260,7 +259,6 @@ ninja="" python= download="enabled" skip_meson=no -use_containers="yes" rust="disabled" rust_target_triple="" @@ -728,11 +726,11 @@ for opt do ;; --disable-plugins) plugins="no" ;; - --enable-containers) use_containers="yes" + --enable-containers) # enabled by default ;; - --disable-containers) use_containers="no" + --disable-containers) meson_option_add -Dcontainers=false ;; - --container-command=*) container_command="$optarg" + --container-command=*) meson_option_add -Dcontainer_command="$optarg" ;; --rust-target-triple=*) rust_target_triple="$optarg" ;; @@ -1719,9 +1717,6 @@ echo all: >> $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak echo "TARGET_DIRS=$target_list" >> $config_host_mak -if test "$container_command" != ""; then - echo "CONTAINER_COMMAND=$container_command" >> $config_host_mak -fi echo "SUBDIRS=$subdirs" >> $config_host_mak if test "$rust" != disabled; then echo "RUST_TARGET_TRIPLE=$rust_target_triple" >> $config_host_mak diff --git a/meson_options.txt b/meson_options.txt index d2bf5ca1f53..5e91969414a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -385,3 +385,7 @@ option('rust', type: 'feature', value: 'disabled', description: 'Rust support') option('strict_rust_lints', type: 'boolean', value: false, description: 'Enable stricter set of Rust warnings') +option('containers', type: 'boolean', value: true, + description: 'use containers to cross compile tcg tests') +option('container_command', type: 'string', + description: 'command to build/run containers') diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build index 120634ae0b0..ba73eecf1c9 100644 --- a/tests/tcg/meson.build +++ b/tests/tcg/meson.build @@ -78,10 +78,23 @@ if gdb.found() endforeach endif -docker_probe = run_command(docker_wrapper, 'probe', check: false) -docker_supported = docker_probe.returncode() == 0 -if docker_supported - docker_wrapper = [docker_wrapper, '--command', docker_probe.stdout().strip()] +docker_supported = false +if get_option('containers') + if get_option('container_command') != '' + # make sure command is working + cmd = get_option('container_command').split() + run_command([cmd, 'info'], check: true) + docker_supported = true + docker_wrapper = [docker_wrapper, '--command', + get_option('container_command')] + else + docker_probe = run_command(docker_wrapper, 'probe', check: false) + docker_supported = docker_probe.returncode() == 0 + if docker_supported + docker_wrapper = [docker_wrapper, '--command', + docker_probe.stdout().strip()] + endif + endif endif # plugins come first, as we need to build the list -- 2.47.3
