diff --git a/meson_options.txt b/meson_options.txt index 22ad24e3..c347afa0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -11,7 +11,7 @@ # # REMEMBER TO UPDATE THE SUMMARY() IN meson.build when adding options here -option('accept_overflowed_buildorder', type : 'boolean', value: 'false', +option('accept_overflowed_buildorder', type : 'boolean', value: false, description : 'Accept overflowed 18446744073709551615 buildorder as -1. This breaks a specification, but some RHEL 8 module builds look like that.') option('verbose_tests', type : 'boolean', value : true, diff --git a/modulemd/meson.build b/modulemd/meson.build index 844f1357..e927d43c 100644 --- a/modulemd/meson.build +++ b/modulemd/meson.build @@ -284,13 +284,15 @@ endif # Test env with release values test_release_env = environment() test_release_env.set('LC_ALL', 'C') -if meson.version().version_compare('< 0.56.0') - project_source_root = meson.source_root() - project_build_root = meson.build_root() -else + +if meson.version().version_compare('>=0.56.0') project_source_root = meson.project_source_root() project_build_root = meson.project_build_root() +else + project_source_root = meson.source_root() + project_build_root = meson.build_root() endif + test_release_env.set ('MESON_SOURCE_ROOT', project_source_root) test_release_env.set ('MESON_BUILD_ROOT', project_build_root) test_release_env.set ('TEST_DATA_PATH', project_source_root + '/modulemd/tests/test_data')