1From ea27b1363ef709ce4b169138017b67ef624b127b Mon Sep 17 00:00:00 2001
2From: Xiangyu Chen <xiangyu.chen@windriver.com>
3Date: Tue, 12 Dec 2023 10:47:42 +0800
4Subject: [PATCH] libcrun: fix compile error without libseccomp and libcap
5
6Fixed compile error without libseccomp and libcap, running
7clang-format to format the code style.
8
9Upstream: https://github.com/containers/crun/commit/ea27b1363ef709ce4b169138017b67ef624b127b
10Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
11---
12 src/libcrun/container.c | 10 ++++++++--
13 1 file changed, 8 insertions(+), 2 deletions(-)
14
15diff --git a/src/libcrun/container.c b/src/libcrun/container.c
16index 34649f8..ffcdb24 100644
17--- a/src/libcrun/container.c
18+++ b/src/libcrun/container.c
19@@ -23,7 +23,9 @@
20 #include "container.h"
21 #include "utils.h"
22 #include "seccomp.h"
23-#include <seccomp.h>
24+#ifdef HAVE_SECCOMP
25+#  include <seccomp.h>
26+#endif
27 #include "scheduler.h"
28 #include "seccomp_notify.h"
29 #include "custom-handler.h"
30@@ -47,7 +49,9 @@
31 #include <sys/signalfd.h>
32 #include <sys/epoll.h>
33 #include <sys/socket.h>
34-#include <sys/capability.h>
35+#ifdef HAVE_CAP
36+#  include <sys/capability.h>
37+#endif
38 #include <sys/ioctl.h>
39 #include <termios.h>
40 #include <grp.h>
41@@ -3829,6 +3833,7 @@ populate_array_field (char ***field, char *array[], size_t num_elements)
42   (*field)[i] = NULL;
43 }
44
45+#ifdef HAVE_CAP
46 static void
47 populate_capabilities (struct features_info_s *info, char ***capabilities, size_t *num_capabilities)
48 {
49@@ -3876,6 +3881,7 @@ populate_capabilities (struct features_info_s *info, char ***capabilities, size_
50   (*capabilities)[index] = NULL; // Terminate the array with NULL
51   populate_array_field (&(info->linux.capabilities), *capabilities, *num_capabilities);
52 }
53+#endif
54
55 static void
56 retrieve_mount_options (struct features_info_s **info)
57--
582.34.1
59
60