fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 05:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: bump required meson version to 1.4

Browse source 
See https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35652#note_2973761

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35742>
This commit is contained in:
Eric Engestrom 2025-06-25 16:14:17 +02:00 • committed by Marge Bot
parent 474774ea58
commit b4ed35994d
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
meson.build
View file

@ -6,7 +6,7 @@ project(
['c', 'cpp'], ['c', 'cpp'],
version : files('VERSION'), version : files('VERSION'),
license : 'MIT', license : 'MIT',
meson_version : '>= 1.3.0', meson_version : '>= 1.4.0',
default_options : [ default_options : [
'buildtype=debugoptimized', 'buildtype=debugoptimized',
'b_ndebug=if-release', 'b_ndebug=if-release',
@ -1906,9 +1906,6 @@ endif
# so add a define to work silence these issues. # so add a define to work silence these issues.
if get_option('b_sanitize') == 'thread' if get_option('b_sanitize') == 'thread'
pre_args += '-DTHREAD_SANITIZER=1' 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')) tsan_blacklist = '-fsanitize-blacklist=@0@'.format(join_paths(meson.project_source_root(), 'build-support', 'tsan-blacklist.txt'))
if cc.has_argument(tsan_blacklist) if cc.has_argument(tsan_blacklist)
pre_args += tsan_blacklist pre_args += tsan_blacklist