diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-24 19:28:04 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-24 19:28:04 -0400 |
| commit | 5464ec8a8e7a84341d192e7614ad55c159652751 (patch) | |
| tree | 0d49d99f7165766f85c0c1443d7fdb1ce6743e68 | |
| parent | 80c6fce81cd1256cbc65bf567aaaa42b6cd60691 (diff) | |
meson: there is no smack library
Detection would always fail, so this was broken.
Treat this as a binary enable/disable option.
| -rw-r--r-- | meson.build | 13 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/meson.build b/meson.build index ae577660cd..59318a9a5d 100644 --- a/meson.build +++ b/meson.build @@ -642,18 +642,6 @@ else libapparmor = [] 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') if smack_run_label != '' conf.set_quoted('SMACK_RUN_LABEL', smack_run_label) @@ -988,6 +976,7 @@ foreach pair : [['utmp', 'HAVE_UTMP'], ['efi', 'ENABLE_EFI'], ['tpm', 'SD_BOOT_LOG_TPM'], ['ima', 'HAVE_IMA'], + ['smack', 'HAVE_SMACK'], ] if get_option(pair[0]) diff --git a/meson_options.txt b/meson_options.txt index 350be3cc88..6d40c3f806 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -168,7 +168,7 @@ option('selinux', type : 'combo', choices : ['auto', 'true', 'false'], description : 'SELinux support') option('apparmor', type : 'combo', choices : ['auto', 'true', 'false'], description : 'AppArmor support') -option('smack', type : 'combo', choices : ['auto', 'true', 'false'], +option('smack', type : 'boolean', description : 'SMACK support') option('smack-run-label', type : 'string', description : 'run systemd --system itself with a specific SMACK label') |