From b4ed35994d003fceb3dc5935a8f8afda00e657c4 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Wed, 25 Jun 2025 16:14:17 +0200 Subject: [PATCH] meson: bump required meson version to 1.4 See https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35652#note_2973761 Part-of: --- meson.build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meson.build b/meson.build index e41be12a1f1..fd4eb0b8af9 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( ['c', 'cpp'], version : files('VERSION'), license : 'MIT', - meson_version : '>= 1.3.0', + meson_version : '>= 1.4.0', default_options : [ 'buildtype=debugoptimized', 'b_ndebug=if-release', @@ -1906,9 +1906,6 @@ endif # so add a define to work silence these issues. if get_option('b_sanitize') == 'thread' pre_args += '-DTHREAD_SANITIZER=1' - # meson versions prior to 1.4 will warn "Consider using the built-in option for sanitizers ..." - # later on because it only checks whether the option starts with "-fsanitize", - # but there is no built-in option for adding a blacklist tsan_blacklist = '-fsanitize-blacklist=@0@'.format(join_paths(meson.project_source_root(), 'build-support', 'tsan-blacklist.txt')) if cc.has_argument(tsan_blacklist) pre_args += tsan_blacklist