]> git.proxmox.com Git - mirror_lxc.git/commitdiff
src/lxc/meson.build: fix build without apparmor
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Thu, 29 Dec 2022 13:42:45 +0000 (14:42 +0100)
committerFabrice Fontaine <fontaine.fabrice@gmail.com>
Thu, 29 Dec 2022 13:47:50 +0000 (14:47 +0100)
Don't build lsm/apparmor.c if apparmor is explicitly disabled by the
user to avoid the following build failure with gcc 4.8:

/home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/bits/fcntl2.h: In function '__apparmor_process_label_open.isra.0':
/home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/bits/fcntl2.h:50:24: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT in second argument needs 3 arguments
    __open_missing_mode ();
                        ^

Fixes:
 - http://autobuild.buildroot.org/results/c9f05ad264543adf429badb99310905427092772

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
src/lxc/meson.build

index 266481f9a65fc5b450500c539206f60a309082e4..f33257c2316a54be67f58104eb481127ef752d9e 100644 (file)
@@ -32,7 +32,6 @@ liblxc_sources = files(
     'cgroups/cgroup2_devices.h',
     'cgroups/cgroup_utils.c',
     'cgroups/cgroup_utils.h',
-    'lsm/apparmor.c',
     'lsm/lsm.c',
     'lsm/lsm.h',
     'lsm/nop.c',
@@ -140,6 +139,10 @@ liblxc_sources = files(
     'uuid.c',
     'uuid.h')
 
+if want_apparmor and libapparmor.found()
+    liblxc_sources += files('lsm/apparmor.c')
+endif
+
 if want_seccomp and libseccomp.found()
     liblxc_sources += files('seccomp.c')
 endif