meson: remove selinux option
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> Reviewed-by: Eric Engestrom <eric@igalia.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31656>
This commit is contained in:
@@ -354,7 +354,6 @@ fedora-release:
|
|||||||
-D platforms=x11,wayland
|
-D platforms=x11,wayland
|
||||||
EXTRA_OPTION: >
|
EXTRA_OPTION: >
|
||||||
-D osmesa=true
|
-D osmesa=true
|
||||||
-D selinux=true
|
|
||||||
-D tools=drm-shim,etnaviv,freedreno,glsl,intel,nir,nouveau,lima,panfrost,imagination
|
-D tools=drm-shim,etnaviv,freedreno,glsl,intel,nir,nouveau,lima,panfrost,imagination
|
||||||
-D vulkan-layers=device-select,overlay
|
-D vulkan-layers=device-select,overlay
|
||||||
-D intel-rt=enabled
|
-D intel-rt=enabled
|
||||||
|
@@ -1982,12 +1982,6 @@ else
|
|||||||
prog_flex_cpp = prog_flex
|
prog_flex_cpp = prog_flex
|
||||||
endif
|
endif
|
||||||
|
|
||||||
dep_selinux = null_dep
|
|
||||||
if get_option('selinux')
|
|
||||||
dep_selinux = dependency('libselinux')
|
|
||||||
pre_args += '-DMESA_SELINUX'
|
|
||||||
endif
|
|
||||||
|
|
||||||
_libunwind = get_option('libunwind') \
|
_libunwind = get_option('libunwind') \
|
||||||
.require(not with_platform_android, error_message : 'Android requires the use of the backtrace library, not libunwind')
|
.require(not with_platform_android, error_message : 'Android requires the use of the backtrace library, not libunwind')
|
||||||
if host_machine.system() == 'darwin'
|
if host_machine.system() == 'darwin'
|
||||||
|
@@ -497,10 +497,8 @@ option(
|
|||||||
option(
|
option(
|
||||||
'selinux',
|
'selinux',
|
||||||
type : 'boolean',
|
type : 'boolean',
|
||||||
value : false,
|
deprecated : true,
|
||||||
description : 'Build an SELinux-aware Mesa. This currently disables ' +
|
description : 'Does nothing, left here for a while to avoid build breakages.',
|
||||||
'execmem support at runtime unless SELinux is configured ' +
|
|
||||||
'with allow_execmem.'
|
|
||||||
)
|
)
|
||||||
|
|
||||||
option(
|
option(
|
||||||
|
@@ -35,7 +35,7 @@ libgallium_nine = shared_library(
|
|||||||
link_depends : gallium_nine_link_depends,
|
link_depends : gallium_nine_link_depends,
|
||||||
link_with : gallium_nine_link_with,
|
link_with : gallium_nine_link_with,
|
||||||
dependencies : [
|
dependencies : [
|
||||||
dep_selinux, dep_libdrm, dep_llvm, dep_thread,
|
dep_libdrm, dep_llvm, dep_thread,
|
||||||
idep_xmlconfig, idep_mesautil, idep_nir,
|
idep_xmlconfig, idep_mesautil, idep_nir,
|
||||||
driver_asahi,
|
driver_asahi,
|
||||||
driver_v3d,
|
driver_v3d,
|
||||||
|
@@ -59,7 +59,7 @@ libgallium_dri = shared_library(
|
|||||||
],
|
],
|
||||||
link_whole : [libdri, gallium_dri_link_whole],
|
link_whole : [libdri, gallium_dri_link_whole],
|
||||||
dependencies : [
|
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_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
|
||||||
driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv,
|
driver_kmsro, driver_v3d, driver_vc4, driver_freedreno, driver_etnaviv,
|
||||||
driver_tegra, driver_i915, driver_svga, driver_virgl,
|
driver_tegra, driver_i915, driver_svga, driver_virgl,
|
||||||
|
@@ -38,7 +38,7 @@ libosmesa = shared_library(
|
|||||||
libmesa, libgallium, libws_null, osmesa_link_with,
|
libmesa, libgallium, libws_null, osmesa_link_with,
|
||||||
],
|
],
|
||||||
dependencies : [
|
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
|
name_prefix : host_machine.system() == 'windows' ? '' : [], # otherwise mingw will create libosmesa.dll
|
||||||
soversion : host_machine.system() == 'windows' ? '' : '8',
|
soversion : host_machine.system() == 'windows' ? '' : '8',
|
||||||
|
@@ -65,7 +65,7 @@ libglapi_bridge = static_library(
|
|||||||
bridge_glapi_files,
|
bridge_glapi_files,
|
||||||
include_directories : [inc_mesa, inc_include, inc_src, inc_mapi, inc_gallium],
|
include_directories : [inc_mesa, inc_include, inc_src, inc_mapi, inc_gallium],
|
||||||
c_args : [c_msvc_compat_args, bridge_glapi_args],
|
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,
|
build_by_default : false,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -77,7 +77,7 @@ else
|
|||||||
static_glapi_files,
|
static_glapi_files,
|
||||||
include_directories : [inc_mesa, inc_include, inc_src, inc_mapi, inc_gallium],
|
include_directories : [inc_mesa, inc_include, inc_src, inc_mapi, inc_gallium],
|
||||||
c_args : [c_msvc_compat_args, static_glapi_args],
|
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,
|
build_by_default : false,
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
@@ -39,7 +39,7 @@ libglapi = shared_library(
|
|||||||
gnu_symbol_visibility : 'hidden',
|
gnu_symbol_visibility : 'hidden',
|
||||||
link_args : [ld_args_gc_sections],
|
link_args : [ld_args_gc_sections],
|
||||||
include_directories : [inc_src, inc_include, inc_mapi],
|
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',
|
soversion : host_machine.system() == 'windows' ? '' : '0',
|
||||||
version : '0.0.0',
|
version : '0.0.0',
|
||||||
name_prefix : host_machine.system() == 'windows' ? 'lib' : [], # always use lib, but avoid warnings on !windows
|
name_prefix : host_machine.system() == 'windows' ? 'lib' : [], # always use lib, but avoid warnings on !windows
|
||||||
|
Reference in New Issue
Block a user