diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index 986e30c595..113af704a8 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -135,9 +135,6 @@ $CC --version meson --version ninja --version -# TODO: drop once minimum meson version is bumped to 0.62 or newer -find . -type f -name meson.build -exec sed -i 's/install_emptydir(\(.*\), install_tag : .*)/install_emptydir(\1)/g' '{}' '+' - for args in "${ARGS[@]}"; do SECONDS=0 diff --git a/.github/workflows/unit_tests.sh b/.github/workflows/unit_tests.sh index 94ecdc6072..168bcc55c3 100755 --- a/.github/workflows/unit_tests.sh +++ b/.github/workflows/unit_tests.sh @@ -33,8 +33,6 @@ function info() { } function run_meson() { - # TODO: drop once minimum meson version is bumped to 0.62 or newer - find . -type f -name meson.build -exec sed -i 's/install_emptydir(\(.*\), install_tag : .*)/install_emptydir(\1)/g' '{}' '+' if ! meson "$@"; then find . -type f -name meson-log.txt -exec cat '{}' + return 1 diff --git a/README b/README index 9b019396c8..9f5c48b67f 100644 --- a/README +++ b/README @@ -255,7 +255,7 @@ REQUIREMENTS: python-pefile (optional, required for ukify) python-lxml (optional, required to build the indices) pyelftools (optional, required for systemd-boot) - meson >= 0.60.0 + meson >= 0.62.0 ninja gcc >= 8.4 >= 13.1.0 is required to build BPF program by using GCC diff --git a/meson.build b/meson.build index 1cdce6a868..7077e1a8cc 100644 --- a/meson.build +++ b/meson.build @@ -10,8 +10,8 @@ project('systemd', 'c', 'localstatedir=/var', 'warning_level=2', ], - meson_version : '>= 0.60.0', - ) + meson_version : '>= 0.62.0', +) project_major_version = meson.project_version().split('.')[0].split('~')[0] if meson.project_version().contains('.')