[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/10] configure: handle meson options that have changed type
From: |
Paolo Bonzini |
Subject: |
[PULL 09/10] configure: handle meson options that have changed type |
Date: |
Sat, 1 May 2021 11:30:25 +0200 |
Usually Meson uses pre-serialized information in meson-private to
speed up re-runs. This is not possible for version changes, where
Meson instead rebuilds the serialized information using cmd_line.txt.
In some cases cmd_line.txt can contain stale information, since it
is not rebuild except when "meson setup" is invoked. Update it in
the configure script to allow upgrading our Meson version.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/configure b/configure
index 0b8283c95c..54f8475444 100755
--- a/configure
+++ b/configure
@@ -6458,6 +6458,15 @@ if test "$skip_meson" = no; then
if test "$?" -ne 0 ; then
error_exit "meson setup failed"
fi
+else
+ if test -f meson-private/cmd_line.txt; then
+ # Adjust old command line options whose type was changed
+ # Avoids having to use "setup --wipe" when Meson is upgraded
+ perl -i -ne '
+ s/^gettext = true$/gettext = auto/;
+ s/^gettext = false$/gettext = disabled/;
+ print;' meson-private/cmd_line.txt
+ fi
fi
if test -n "${deprecated_features}"; then
--
2.31.1
- [PULL 00/10] Misc patches for 2021-04-30 (incl. NVMM accelerator), Paolo Bonzini, 2021/05/01
- [PULL 02/10] Add NVMM accelerator: configure and build logic, Paolo Bonzini, 2021/05/01
- [PULL 06/10] ratelimit: protect with a mutex, Paolo Bonzini, 2021/05/01
- [PULL 10/10] gitlab-ci: use --meson=internal for CFI jobs, Paolo Bonzini, 2021/05/01
- [PULL 01/10] oslib-win32: do not rely on macro to get redefined function name, Paolo Bonzini, 2021/05/01
- [PULL 07/10] slirp: add configure option to disable smbd, Paolo Bonzini, 2021/05/01
- [PULL 03/10] Add NVMM accelerator: x86 CPU support, Paolo Bonzini, 2021/05/01
- [PULL 08/10] configure: reindent meson invocation, Paolo Bonzini, 2021/05/01
- [PULL 05/10] Add NVMM Accelerator: add maintainers for NetBSD/NVMM, Paolo Bonzini, 2021/05/01
- [PULL 04/10] Add NVMM accelerator: acceleration enlightenments, Paolo Bonzini, 2021/05/01
- [PULL 09/10] configure: handle meson options that have changed type,
Paolo Bonzini <=
- Re: [PULL 00/10] Misc patches for 2021-04-30 (incl. NVMM accelerator), Peter Maydell, 2021/05/01