[lxc/lxc] 70b176: src/lxc/meson.build: fix build without apparmor

0 views
Skip to first unread message

Christian Brauner

unread,
Jan 5, 2023, 4:30:47 AM1/5/23
to lxc-...@lists.linuxcontainers.org
Branch: refs/heads/master
Home: https://github.com/lxc/lxc
Commit: 70b176b0d119e0aa6e2910cc8e00a38fbc8f18af
https://github.com/lxc/lxc/commit/70b176b0d119e0aa6e2910cc8e00a38fbc8f18af
Author: Fabrice Fontaine <fontaine...@gmail.com>
Date: 2022-12-29 (Thu, 29 Dec 2022)

Changed paths:
M src/lxc/meson.build

Log Message:
-----------
src/lxc/meson.build: fix build without apparmor

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...@gmail.com>


Commit: 440727ea38ff8c8364d6caca9c5a213fc62c8499
https://github.com/lxc/lxc/commit/440727ea38ff8c8364d6caca9c5a213fc62c8499
Author: Christian Brauner <chri...@brauner.io>
Date: 2023-01-05 (Thu, 05 Jan 2023)

Changed paths:
M src/lxc/meson.build

Log Message:
-----------
Merge pull request #4246 from ffontaine/master

src/lxc/meson.build: fix build without apparmor


Compare: https://github.com/lxc/lxc/compare/1641f4576bcf...440727ea38ff
Reply all
Reply to author
Forward
0 new messages