From 894c4f0c7889fbaeea3e4ab289cb505eb3643976 Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Tue, 15 Oct 2024 09:46:19 +0200 Subject: [PATCH] meson: remove selinux option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Michel Dänzer Reviewed-by: Eric Engestrom Part-of: --- .gitlab-ci/build/gitlab-ci.yml | 1 - meson.build | 6 ------ meson_options.txt | 6 ++---- src/gallium/targets/d3dadapter9/meson.build | 2 +- src/gallium/targets/dri/meson.build | 2 +- src/gallium/targets/osmesa/meson.build | 2 +- src/mapi/glapi/meson.build | 4 ++-- src/mapi/shared-glapi/meson.build | 2 +- 8 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 0c6100357e8..288de70e15d 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -354,7 +354,6 @@ fedora-release: -D platforms=x11,wayland EXTRA_OPTION: > -D osmesa=true - -D selinux=true -D tools=drm-shim,etnaviv,freedreno,glsl,intel,nir,nouveau,lima,panfrost,imagination -D vulkan-layers=device-select,overlay -D intel-rt=enabled diff --git a/meson.build b/meson.build index 5a22529e420..43b42c14ce2 100644 --- a/meson.build +++ b/meson.build @@ -1982,12 +1982,6 @@ else prog_flex_cpp = prog_flex endif -dep_selinux = null_dep -if get_option('selinux') - dep_selinux = dependency('libselinux') - pre_args += '-DMESA_SELINUX' -endif - _libunwind = get_option('libunwind') \ .require(not with_platform_android, error_message : 'Android requires the use of the backtrace library, not libunwind') if host_machine.system() == 'darwin' diff --git a/meson_options.txt b/meson_options.txt index de4673a5b24..79ee65e6094 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -497,10 +497,8 @@ option( option( 'selinux', type : 'boolean', - value : false, - description : 'Build an SELinux-aware Mesa. This currently disables ' + - 'execmem support at runtime unless SELinux is configured ' + - 'with allow_execmem.' + deprecated : true, + description : 'Does nothing, left here for a while to avoid build breakages.', ) option( diff --git a/src/gallium/targets/d3dadapter9/meson.build b/src/gallium/targets/d3dadapter9/meson.build index 88df4708644..19215413ce0 100644 --- a/src/gallium/targets/d3dadapter9/meson.build +++ b/src/gallium/targets/d3dadapter9/meson.build @@ -35,7 +35,7 @@ libgallium_nine = shared_library( link_depends : gallium_nine_link_depends, link_with : gallium_nine_link_with, dependencies : [ - dep_selinux, dep_libdrm, dep_llvm, dep_thread, + dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig, idep_mesautil, idep_nir, driver_asahi, driver_v3d, diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index e4ed5dd68b8..42af4c44911 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -59,7 +59,7 @@ libgallium_dri = shared_library( ], link_whole : [libdri, gallium_dri_link_whole], dependencies : [ - dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig, idep_mesautil, + dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig, idep_mesautil, driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau, driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv, driver_tegra, driver_i915, driver_svga, driver_virgl, diff --git a/src/gallium/targets/osmesa/meson.build b/src/gallium/targets/osmesa/meson.build index 55befd2cd83..3c371616e7e 100644 --- a/src/gallium/targets/osmesa/meson.build +++ b/src/gallium/targets/osmesa/meson.build @@ -38,7 +38,7 @@ libosmesa = shared_library( libmesa, libgallium, libws_null, osmesa_link_with, ], dependencies : [ - dep_ws2_32, dep_selinux, dep_thread, dep_clock, dep_unwind, driver_swrast, idep_mesautil, + dep_ws2_32, dep_thread, dep_clock, dep_unwind, driver_swrast, idep_mesautil, ], name_prefix : host_machine.system() == 'windows' ? '' : [], # otherwise mingw will create libosmesa.dll soversion : host_machine.system() == 'windows' ? '' : '8', diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build index d6b209a82f3..d15a59caadc 100644 --- a/src/mapi/glapi/meson.build +++ b/src/mapi/glapi/meson.build @@ -65,7 +65,7 @@ libglapi_bridge = static_library( bridge_glapi_files, include_directories : [inc_mesa, inc_include, inc_src, inc_mapi, inc_gallium], c_args : [c_msvc_compat_args, bridge_glapi_args], - dependencies : [dep_thread, dep_selinux, idep_mesautil], + dependencies : [dep_thread, idep_mesautil], build_by_default : false, ) @@ -77,7 +77,7 @@ else static_glapi_files, include_directories : [inc_mesa, inc_include, inc_src, inc_mapi, inc_gallium], c_args : [c_msvc_compat_args, static_glapi_args], - dependencies : [dep_thread, dep_selinux, idep_mesautil], + dependencies : [dep_thread, idep_mesautil], build_by_default : false, ) endif diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build index 7572f950cff..e9e7366568a 100644 --- a/src/mapi/shared-glapi/meson.build +++ b/src/mapi/shared-glapi/meson.build @@ -39,7 +39,7 @@ libglapi = shared_library( gnu_symbol_visibility : 'hidden', link_args : [ld_args_gc_sections], include_directories : [inc_src, inc_include, inc_mapi], - dependencies : [dep_thread, dep_selinux, idep_mesautil], + dependencies : [dep_thread, idep_mesautil], soversion : host_machine.system() == 'windows' ? '' : '0', version : '0.0.0', name_prefix : host_machine.system() == 'windows' ? 'lib' : [], # always use lib, but avoid warnings on !windows