mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-23 19:34:41 +00:00
configure: preserve qemu-ga variables
Ensure that qemu-ga variables set at configure time are kept later when the script is rerun. For preserve_env to work, the variables need to be empty so move the default values to config-host.mak generation. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
f9c77801f4
commit
954ed68f99
23
configure
vendored
23
configure
vendored
|
@ -2227,20 +2227,6 @@ if test "$have_ubsan" = "yes"; then
|
||||||
QEMU_LDFLAGS="-fsanitize=undefined $QEMU_LDFLAGS"
|
QEMU_LDFLAGS="-fsanitize=undefined $QEMU_LDFLAGS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
##########################################
|
|
||||||
# Guest agent Windows MSI package
|
|
||||||
|
|
||||||
if test "$QEMU_GA_MANUFACTURER" = ""; then
|
|
||||||
QEMU_GA_MANUFACTURER=QEMU
|
|
||||||
fi
|
|
||||||
if test "$QEMU_GA_DISTRO" = ""; then
|
|
||||||
QEMU_GA_DISTRO=Linux
|
|
||||||
fi
|
|
||||||
if test "$QEMU_GA_VERSION" = ""; then
|
|
||||||
QEMU_GA_VERSION=$(cat "$source_path"/VERSION)
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#######################################
|
#######################################
|
||||||
# cross-compiled firmware targets
|
# cross-compiled firmware targets
|
||||||
|
|
||||||
|
@ -2336,9 +2322,9 @@ if test "$debug_tcg" = "yes" ; then
|
||||||
fi
|
fi
|
||||||
if test "$mingw32" = "yes" ; then
|
if test "$mingw32" = "yes" ; then
|
||||||
echo "CONFIG_WIN32=y" >> $config_host_mak
|
echo "CONFIG_WIN32=y" >> $config_host_mak
|
||||||
echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER}" >> $config_host_mak
|
echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER-QEMU}" >> $config_host_mak
|
||||||
echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO}" >> $config_host_mak
|
echo "QEMU_GA_DISTRO=${QEMU_GA_DISTRO-Linux}" >> $config_host_mak
|
||||||
echo "QEMU_GA_VERSION=${QEMU_GA_VERSION}" >> $config_host_mak
|
echo "QEMU_GA_VERSION=${QEMU_GA_VERSION-$(cat "$source_path"/VERSION)}" >> $config_host_mak
|
||||||
else
|
else
|
||||||
echo "CONFIG_POSIX=y" >> $config_host_mak
|
echo "CONFIG_POSIX=y" >> $config_host_mak
|
||||||
fi
|
fi
|
||||||
|
@ -2653,6 +2639,9 @@ preserve_env PKG_CONFIG
|
||||||
preserve_env PKG_CONFIG_LIBDIR
|
preserve_env PKG_CONFIG_LIBDIR
|
||||||
preserve_env PKG_CONFIG_PATH
|
preserve_env PKG_CONFIG_PATH
|
||||||
preserve_env PYTHON
|
preserve_env PYTHON
|
||||||
|
preserve_env QEMU_GA_MANUFACTURER
|
||||||
|
preserve_env QEMU_GA_DISTRO
|
||||||
|
preserve_env QEMU_GA_VERSION
|
||||||
preserve_env SDL2_CONFIG
|
preserve_env SDL2_CONFIG
|
||||||
preserve_env SMBD
|
preserve_env SMBD
|
||||||
preserve_env STRIP
|
preserve_env STRIP
|
||||||
|
|
Loading…
Reference in a new issue