Skip to content
Snippets Groups Projects
Commit 1191ab79 authored by Ludovico de Nittis's avatar Ludovico de Nittis :palm_tree:
Browse files

Merge branch 'wip/task679-prep' into 'main'

Build system simplifications

See merge request !794
parents bcf6301d 6b2c2d66
No related branches found
No related tags found
1 merge request!794Build system simplifications
...@@ -266,11 +266,15 @@ endif ...@@ -266,11 +266,15 @@ endif
bubblewrap_subproject = subproject( bubblewrap_subproject = subproject(
'bubblewrap', 'bubblewrap',
default_options : [ default_options : [
'bash_completion=disabled',
'build_rpath=' + pkglibexec_rpath, 'build_rpath=' + pkglibexec_rpath,
'bwrapdir=' + pkglibexecdir, 'bwrapdir=' + pkglibexecdir,
'install_rpath=' + pkglibexec_rpath, 'install_rpath=' + pkglibexec_rpath,
'man=disabled',
'program_prefix=srt-', 'program_prefix=srt-',
'selinux=disabled',
'tests=false', 'tests=false',
'zsh_completion=disabled',
], ],
) )
srt_bin += bubblewrap_subproject.get_variable('bwrap') srt_bin += bubblewrap_subproject.get_variable('bwrap')
......
...@@ -218,27 +218,11 @@ add_project_link_arguments( ...@@ -218,27 +218,11 @@ add_project_link_arguments(
# for both direct and indirect dependencies: in particular we need # for both direct and indirect dependencies: in particular we need
# to pick up the whole GLib family (GLib, GObject, GIO) from the same # to pick up the whole GLib family (GLib, GObject, GIO) from the same
# location. (It also bypasses LD_LIBRARY_PATH.) # location. (It also bypasses LD_LIBRARY_PATH.)
'-Wl,-z,--disable-new-dtags', '-Wl,--disable-new-dtags',
), ),
language : 'c', language : 'c',
) )
libselinux_dep = dependency(
'libselinux',
version : '>= 2.1.9',
required : false,
)
libcap_dep = dependency(
'libcap',
required : false,
)
if not libcap_dep.found()
libcap_dep = c_compiler.find_library(
'cap',
required : get_option('bin'),
)
endif
waffle_dep = dependency( waffle_dep = dependency(
'waffle-1', 'waffle-1',
version : '>= 1.6', version : '>= 1.6',
...@@ -246,11 +230,6 @@ waffle_dep = dependency( ...@@ -246,11 +230,6 @@ waffle_dep = dependency(
conf_data = configuration_data() conf_data = configuration_data()
conf_data.set_quoted('VERSION', version) conf_data.set_quoted('VERSION', version)
conf_data.set('HAVE_SELINUX', libselinux_dep.found())
conf_data.set(
'HAVE_SELINUX_2_3',
libselinux_dep.found() and libselinux_dep.version().version_compare('>=2.3'),
)
conf_data.set('api_major', api_major) conf_data.set('api_major', api_major)
conf_data.set('abi_major', abi_major) conf_data.set('abi_major', abi_major)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment