shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

meson: there is no smack library

Browse Source 
Detection would always fail, so this was broken.
Treat this as a binary enable/disable option.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-24 19:28:04 -04:00
parent 80c6fce81c
commit 5464ec8a8e
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meson.build
View File

@ -642,18 +642,6 @@ else
libapparmor = [] libapparmor = []
endif endif
want_smack = get_option('smack')
if want_smack != 'false'
libsmack = dependency('libsmack',
required : want_smack == 'true')
if libsmack.found()
conf.set('HAVE_SMACK', 1)
m4_defines += ['-DHAVE_SMACK']
endif
else
libsmack = []
endif
smack_run_label = get_option('smack-run-label') smack_run_label = get_option('smack-run-label')
if smack_run_label != '' if smack_run_label != ''
conf.set_quoted('SMACK_RUN_LABEL', smack_run_label) conf.set_quoted('SMACK_RUN_LABEL', smack_run_label)
@ -988,6 +976,7 @@ foreach pair : [['utmp', 'HAVE_UTMP'],
['efi', 'ENABLE_EFI'], ['efi', 'ENABLE_EFI'],
['tpm', 'SD_BOOT_LOG_TPM'], ['tpm', 'SD_BOOT_LOG_TPM'],
['ima', 'HAVE_IMA'], ['ima', 'HAVE_IMA'],
['smack', 'HAVE_SMACK'],
] ]
if get_option(pair[0]) if get_option(pair[0])

2
meson_options.txt
View File

@ -168,7 +168,7 @@ option('selinux', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'SELinux support') description : 'SELinux support')
option('apparmor', type : 'combo', choices : ['auto', 'true', 'false'], option('apparmor', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'AppArmor support') description : 'AppArmor support')
option('smack', type : 'combo', choices : ['auto', 'true', 'false'], option('smack', type : 'boolean',
description : 'SMACK support') description : 'SMACK support')
option('smack-run-label', type : 'string', option('smack-run-label', type : 'string',
description : 'run systemd --system itself with a specific SMACK label') description : 'run systemd --system itself with a specific SMACK label')