SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure: fix backwards-compatibility for meson sphinx_build option

Browse Source 
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 <peter.maydell@linaro.org>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-05-19 20:04:07 +02:00
parent b0fcc6fc7f
commit 973038db87
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -1987,6 +1987,14 @@ if test "$skip_meson" = no; then
if test "$?" -ne 0 ; then if test "$?" -ne 0 ; then
error_exit "meson setup failed" error_exit "meson setup failed"
fi 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 fi
# Save the configure command line for later reuse. # Save the configure command line for later reuse.