Skip to content

Commit

Permalink
configure: remove backwards-compatibility code
Browse files Browse the repository at this point in the history
The cmd_line.txt mangling is only needed when rebuilding from very old
trees and is kept mostly as an example of how to extend it.  However,
Meson 0.63 introduces a deprecation mechanism for meson_options.txt
that can be used instead, so get rid of our home-grown hack.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
bonzini committed Jan 11, 2023
1 parent 3d30462 commit 75cc286
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions configure
Expand Up @@ -2568,16 +2568,6 @@ 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/;
/^b_staticpic/ && next;
print;' meson-private/cmd_line.txt
fi
fi

# Save the configure command line for later reuse.
Expand Down

0 comments on commit 75cc286

Please sign in to comment.