diff options
| -rwxr-xr-x | configure | 2 | ||||
| m--------- | meson | 0 | ||||
| -rwxr-xr-x | scripts/meson-buildoptions.py | 16 |
3 files changed, 1 insertions, 17 deletions
@@ -1500,7 +1500,7 @@ python_version=$($python -c 'import sys; print("%d.%d.%d" % (sys.version_info[0] python="$python -B" if test -z "$meson"; then - if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.59.2; then + if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.59.3; then meson=meson elif test $git_submodules_action != 'ignore' ; then meson=git diff --git a/meson b/meson -Subproject b25d94e7c77fda05a7fdfe8afe562cf9760d69d +Subproject 12f9f04ba0decfda425dbbf9a501084c153a2d1 diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 256523c09d..96969d89ee 100755 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -150,23 +150,7 @@ def print_parse(options): print("}") -def fixup_options(options): - # Meson <= 0.60 does not include the choices in array options, fix that up - for opt in options: - if opt["name"] == "trace_backends": - opt["choices"] = [ - "dtrace", - "ftrace", - "log", - "nop", - "simple", - "syslog", - "ust", - ] - - options = load_options(json.load(sys.stdin)) -fixup_options(options) print("# This file is generated by meson-buildoptions.py, do not edit!") print_help(options) print_parse(options) |