meson, configure: move --interp-prefix to meson
This is the last CONFIG_* entry in config-host.mak that had to be special cased. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
b0b4323e32
commit
ce6119dc8e
6
configure
vendored
6
configure
vendored
@ -231,7 +231,6 @@ fi
|
|||||||
|
|
||||||
# default parameters
|
# default parameters
|
||||||
cpu=""
|
cpu=""
|
||||||
interp_prefix="/usr/gnemul/qemu-%M"
|
|
||||||
static="no"
|
static="no"
|
||||||
cross_compile="no"
|
cross_compile="no"
|
||||||
cross_prefix=""
|
cross_prefix=""
|
||||||
@ -697,8 +696,6 @@ for opt do
|
|||||||
;;
|
;;
|
||||||
--prefix=*) prefix="$optarg"
|
--prefix=*) prefix="$optarg"
|
||||||
;;
|
;;
|
||||||
--interp-prefix=*) interp_prefix="$optarg"
|
|
||||||
;;
|
|
||||||
--cross-prefix=*)
|
--cross-prefix=*)
|
||||||
;;
|
;;
|
||||||
--cc=*)
|
--cc=*)
|
||||||
@ -1091,8 +1088,6 @@ Options: [defaults in brackets after descriptions]
|
|||||||
Standard options:
|
Standard options:
|
||||||
--help print this message
|
--help print this message
|
||||||
--prefix=PREFIX install in PREFIX [$prefix]
|
--prefix=PREFIX install in PREFIX [$prefix]
|
||||||
--interp-prefix=PREFIX where to find shared libraries, etc.
|
|
||||||
use %M for cpu name [$interp_prefix]
|
|
||||||
--target-list=LIST set target list (default: build all)
|
--target-list=LIST set target list (default: build all)
|
||||||
$(echo Available targets: $default_target_list | \
|
$(echo Available targets: $default_target_list | \
|
||||||
fold -s -w 53 | sed -e 's/^/ /')
|
fold -s -w 53 | sed -e 's/^/ /')
|
||||||
@ -2289,7 +2284,6 @@ for target in $target_list; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "CONFIG_QEMU_INTERP_PREFIX=$interp_prefix" | sed 's/%M/@0@/' >> $config_host_mak
|
|
||||||
if test "$default_targets" = "yes"; then
|
if test "$default_targets" = "yes"; then
|
||||||
echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
|
echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
@ -2228,10 +2228,8 @@ if targetos == 'windows' and link_language == 'cpp'
|
|||||||
endif
|
endif
|
||||||
config_host_data.set('HAVE_VSS_SDK', have_vss_sdk)
|
config_host_data.set('HAVE_VSS_SDK', have_vss_sdk)
|
||||||
|
|
||||||
ignored = ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target
|
|
||||||
'HAVE_GDB_BIN']
|
|
||||||
foreach k, v: config_host
|
foreach k, v: config_host
|
||||||
if k.startswith('CONFIG_') and not ignored.contains(k)
|
if k.startswith('CONFIG_')
|
||||||
config_host_data.set(k, v == 'y' ? 1 : v)
|
config_host_data.set(k, v == 'y' ? 1 : v)
|
||||||
endif
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
@ -2337,7 +2335,7 @@ foreach target : target_dirs
|
|||||||
config_target += {
|
config_target += {
|
||||||
'CONFIG_USER_ONLY': 'y',
|
'CONFIG_USER_ONLY': 'y',
|
||||||
'CONFIG_QEMU_INTERP_PREFIX':
|
'CONFIG_QEMU_INTERP_PREFIX':
|
||||||
config_host['CONFIG_QEMU_INTERP_PREFIX'].format(config_target['TARGET_NAME'])
|
get_option('interp_prefix').replace('%M', config_target['TARGET_NAME'])
|
||||||
}
|
}
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -27,6 +27,8 @@ option('block_drv_rw_whitelist', type : 'string', value : '',
|
|||||||
description: 'set block driver read-write whitelist (by default affects only QEMU, not tools like qemu-img)')
|
description: 'set block driver read-write whitelist (by default affects only QEMU, not tools like qemu-img)')
|
||||||
option('block_drv_ro_whitelist', type : 'string', value : '',
|
option('block_drv_ro_whitelist', type : 'string', value : '',
|
||||||
description: 'set block driver read-only whitelist (by default affects only QEMU, not tools like qemu-img)')
|
description: 'set block driver read-only whitelist (by default affects only QEMU, not tools like qemu-img)')
|
||||||
|
option('interp_prefix', type : 'string', value : '/usr/gnemul/qemu-%M',
|
||||||
|
description: 'where to find shared libraries etc., use %M for cpu name')
|
||||||
option('fuzzing_engine', type : 'string', value : '',
|
option('fuzzing_engine', type : 'string', value : '',
|
||||||
description: 'fuzzing engine library for OSS-Fuzz')
|
description: 'fuzzing engine library for OSS-Fuzz')
|
||||||
option('trace_file', type: 'string', value: 'trace',
|
option('trace_file', type: 'string', value: 'trace',
|
||||||
|
@ -41,6 +41,8 @@ meson_options_help() {
|
|||||||
printf "%s\n" ' Set available tracing backends [log] (choices:'
|
printf "%s\n" ' Set available tracing backends [log] (choices:'
|
||||||
printf "%s\n" ' dtrace/ftrace/log/nop/simple/syslog/ust)'
|
printf "%s\n" ' dtrace/ftrace/log/nop/simple/syslog/ust)'
|
||||||
printf "%s\n" ' --iasl=VALUE Path to ACPI disassembler'
|
printf "%s\n" ' --iasl=VALUE Path to ACPI disassembler'
|
||||||
|
printf "%s\n" ' --interp-prefix=VALUE where to find shared libraries etc., use %M for'
|
||||||
|
printf "%s\n" ' cpu name [/usr/gnemul/qemu-%M]'
|
||||||
printf "%s\n" ' --sphinx-build=VALUE Use specified sphinx-build for building document'
|
printf "%s\n" ' --sphinx-build=VALUE Use specified sphinx-build for building document'
|
||||||
printf "%s\n" ' --tls-priority=VALUE Default TLS protocol/cipher priority string'
|
printf "%s\n" ' --tls-priority=VALUE Default TLS protocol/cipher priority string'
|
||||||
printf "%s\n" ' [NORMAL]'
|
printf "%s\n" ' [NORMAL]'
|
||||||
@ -252,6 +254,7 @@ _meson_option_parse() {
|
|||||||
--disable-iconv) printf "%s" -Diconv=disabled ;;
|
--disable-iconv) printf "%s" -Diconv=disabled ;;
|
||||||
--enable-install-blobs) printf "%s" -Dinstall_blobs=true ;;
|
--enable-install-blobs) printf "%s" -Dinstall_blobs=true ;;
|
||||||
--disable-install-blobs) printf "%s" -Dinstall_blobs=false ;;
|
--disable-install-blobs) printf "%s" -Dinstall_blobs=false ;;
|
||||||
|
--interp-prefix=*) quote_sh "-Dinterp_prefix=$2" ;;
|
||||||
--enable-jack) printf "%s" -Djack=enabled ;;
|
--enable-jack) printf "%s" -Djack=enabled ;;
|
||||||
--disable-jack) printf "%s" -Djack=disabled ;;
|
--disable-jack) printf "%s" -Djack=disabled ;;
|
||||||
--enable-keyring) printf "%s" -Dkeyring=enabled ;;
|
--enable-keyring) printf "%s" -Dkeyring=enabled ;;
|
||||||
|
Loading…
Reference in New Issue
Block a user