From 185001a86fba6c176e7f5e5446c2b13b456d4a7a Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 16 May 2023 11:15:32 +0200 Subject: [PATCH] meson: remove needless c++17-overrides C++17 is the project-wide default since f9057cea517 ("fix(FTBFS): meson: raise C++ standard to C++17"), so let's drop these local overrides. Reviewed-by: Eric Engestrom Reviewed-by: Emma Anholt Part-of: --- src/amd/compiler/meson.build | 1 - src/egl/meson.build | 3 --- src/freedreno/ds/meson.build | 1 - src/gallium/drivers/freedreno/meson.build | 1 - src/gallium/drivers/r600/meson.build | 2 -- src/gallium/drivers/r600/sfn/tests/meson.build | 2 -- src/intel/compiler/meson.build | 2 -- src/intel/ds/meson.build | 2 -- src/panfrost/ds/meson.build | 1 - src/tool/pps/meson.build | 3 --- 10 files changed, 18 deletions(-) diff --git a/src/amd/compiler/meson.build b/src/amd/compiler/meson.build index b5b92f11d5e..8016495dac9 100644 --- a/src/amd/compiler/meson.build +++ b/src/amd/compiler/meson.build @@ -96,7 +96,6 @@ _libaco = static_library( gnu_symbol_visibility : 'hidden', build_by_default : true, cpp_args : [cpp_args_aco, cpp_msvc_compat_args], - override_options: ['cpp_std=c++17'], ) # Also link with aco diff --git a/src/egl/meson.build b/src/egl/meson.build index 013a93367d6..f387bde4bde 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -23,7 +23,6 @@ inc_egl_dri2 = include_directories('drivers/dri2') c_args_for_egl = [asan_c_args] cpp_args_for_egl = [] -override_for_egl = [] link_for_egl = [] deps_for_egl = [] incs_for_egl = [inc_include, inc_src, inc_egl] @@ -140,7 +139,6 @@ if with_dri2 files_egl += files('drivers/dri2/platform_android_mapper.cpp') c_args_for_egl += '-DUSE_IMAPPER4_METADATA_API' cpp_args_for_egl += '-DUSE_IMAPPER4_METADATA_API' - override_for_egl += 'cpp_std=c++17' endif endif elif with_platform_haiku @@ -201,7 +199,6 @@ libegl = shared_library( '-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_@0@'.format(egl_native_platform.to_upper()), ], cpp_args : [cpp_args_for_egl], - override_options : override_for_egl, gnu_symbol_visibility : 'hidden', include_directories : incs_for_egl, link_with : [link_for_egl, libglapi], diff --git a/src/freedreno/ds/meson.build b/src/freedreno/ds/meson.build index ad210bef9da..d5c59dd9ae1 100644 --- a/src/freedreno/ds/meson.build +++ b/src/freedreno/ds/meson.build @@ -21,7 +21,6 @@ pps_freedreno_lib = static_library( dep_perfetto, dep_valgrind, ], - override_options: ['cpp_std=c++17'] ) pps_freedreno_dep = declare_dependency( diff --git a/src/gallium/drivers/freedreno/meson.build b/src/gallium/drivers/freedreno/meson.build index f0d1e4b569e..1ac9dc78df5 100644 --- a/src/gallium/drivers/freedreno/meson.build +++ b/src/gallium/drivers/freedreno/meson.build @@ -303,7 +303,6 @@ libfreedreno = static_library( cpp_args : [freedreno_cpp_args], gnu_symbol_visibility : 'hidden', dependencies : libfreedreno_dependencies, - override_options : ['cpp_std=c++17'], ) driver_freedreno = declare_dependency( diff --git a/src/gallium/drivers/r600/meson.build b/src/gallium/drivers/r600/meson.build index 85911d66912..d14f1ac6f50 100644 --- a/src/gallium/drivers/r600/meson.build +++ b/src/gallium/drivers/r600/meson.build @@ -201,7 +201,6 @@ endif r600_cpp_args = [] if cpp.has_type('std::pmr::monotonic_buffer_resource', - args:['-std=c++17'], prefix : '#include ') r600_cpp_args += '-DHAVE_MEMORY_RESOURCE' endif @@ -211,7 +210,6 @@ libr600 = static_library( [files_r600, egd_tables_h], c_args : [r600_c_args, '-Wstrict-overflow=0'], cpp_args: r600_cpp_args, - override_options: ['cpp_std=c++17'], gnu_symbol_visibility : 'hidden', include_directories : [ inc_src, inc_mapi, inc_mesa, inc_include, inc_compiler, inc_gallium, inc_gallium_aux, inc_amd_common, diff --git a/src/gallium/drivers/r600/sfn/tests/meson.build b/src/gallium/drivers/r600/sfn/tests/meson.build index d0f4d3b4087..dec84082c58 100644 --- a/src/gallium/drivers/r600/sfn/tests/meson.build +++ b/src/gallium/drivers/r600/sfn/tests/meson.build @@ -1,7 +1,6 @@ r600_test_lib = static_library('r600_test', 'sfn_test_shaders.cpp', cpp_args: r600_cpp_args, - override_options: ['cpp_std=c++17'], include_directories : [ inc_src, inc_mapi, inc_mesa, inc_include, inc_compiler, inc_gallium, inc_gallium_aux, inc_amd_common, inc_gallium_drivers, ], @@ -29,7 +28,6 @@ if with_tests executable('test-@0@-r600-sfn'.format(t), ['sfn_@0@_test.cpp'.format(t)], dependencies : [r600_test_dep], - override_options: ['cpp_std=c++17'] ), suite : ['r600'] ) diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build index 9a03d372598..95f9516c7d9 100644 --- a/src/intel/compiler/meson.build +++ b/src/intel/compiler/meson.build @@ -161,7 +161,6 @@ libintel_compiler = static_library( [libintel_compiler_files, brw_nir_trig, ir_expression_operation_h], include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel], c_args : [no_override_init_args], - override_options: ['cpp_std=c++17'], gnu_symbol_visibility : 'hidden', dependencies : [idep_nir_headers, idep_mesautil, idep_intel_dev], build_by_default : false, @@ -207,7 +206,6 @@ if with_tests link_with : [ libintel_compiler, libintel_common, libisl ], - override_options: ['cpp_std=c++17'], dependencies : [idep_gtest, idep_nir, idep_mesautil, idep_intel_dev], ), suite : ['intel'], diff --git a/src/intel/ds/meson.build b/src/intel/ds/meson.build index 712eee46f36..06bd98bc4e3 100644 --- a/src/intel/ds/meson.build +++ b/src/intel/ds/meson.build @@ -39,7 +39,6 @@ libintel_driver_ds = static_library( include_directories : [inc_src, inc_include, inc_intel, inc_mapi, inc_mesa], link_with : [libintel_perf, libintel_common], dependencies : [libintel_driver_ds_deps, idep_intel_dev], - override_options : ['cpp_std=c++17'], gnu_symbol_visibility : 'hidden', ) @@ -61,7 +60,6 @@ if with_perfetto and (with_datasources.contains('intel') or with_datasources.con include_directories: [inc_tool, inc_src, inc_include, inc_intel], link_with: [libintel_perf, libintel_common], dependencies: [dep_perfetto, dep_libdrm, idep_mesautil, idep_intel_dev], - override_options: ['cpp_std=c++17'] ) compile_args_pps_intel = ['-DPPS_INTEL'] diff --git a/src/panfrost/ds/meson.build b/src/panfrost/ds/meson.build index 9a8bdaf08ec..49497aa701d 100644 --- a/src/panfrost/ds/meson.build +++ b/src/panfrost/ds/meson.build @@ -16,7 +16,6 @@ pps_panfrost_lib = static_library( sources: pps_panfrost_sources, include_directories: pps_panfrost_includes, dependencies: [dep_libdrm, dep_perfetto, libpanfrost_dep, dep_panfrost_perf], - override_options: ['cpp_std=c++17'] ) compile_args_pps_panfrost = ['-DPPS_PANFROST'] diff --git a/src/tool/pps/meson.build b/src/tool/pps/meson.build index 4261fbc4ef5..71f07695ea6 100644 --- a/src/tool/pps/meson.build +++ b/src/tool/pps/meson.build @@ -21,7 +21,6 @@ lib_pps = static_library( sources: pps_sources, include_directories: [include_pps, inc_src, pps_includes], dependencies: pps_deps, - override_options: ['cpp_std=c++17'], ) dep_pps = declare_dependency( @@ -39,7 +38,6 @@ executable( sources: producer_sources, include_directories: [include_pps, inc_src], dependencies: [dep_pps, dep_perfetto], - override_options: ['cpp_std=c++17'], install: true ) @@ -55,7 +53,6 @@ if dep_docopt.found() sources: config_sources, include_directories: [include_pps, inc_src], dependencies: [dep_pps, dep_docopt], - override_options: ['cpp_std=c++17'], install: true ) endif