From 973038db87154f954e8cd889d706089489a43d46 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 19 May 2023 20:04:07 +0200 Subject: [PATCH] configure: fix backwards-compatibility for meson sphinx_build option Reintroduce the cmd_line.txt mangling to remove the sphinx_build option when rerunning meson. The mechanism was removed in commit 75cc28648574 ("configure: remove backwards-compatibility code", 2023-01-11) because the fixups were obsolete at the time; however, the Meson deprecation mechanism doesn't quite work when options are finally removed, so we need to bring it back. Reported-by: Peter Maydell Tested-by: Peter Maydell Signed-off-by: Paolo Bonzini --- configure | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/configure b/configure index bcab685cfd..f7cd376e52 100755 --- a/configure +++ b/configure @@ -1987,6 +1987,14 @@ 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 that were removed + # sed -i is not portable + perl -i -ne ' + /^sphinx_build/ && next; + print;' meson-private/cmd_line.txt + fi fi # Save the configure command line for later reuse.