From a04464807afcb461d5e6960da06f446f6393596f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Sep 2023 14:51:32 +0200 Subject: [PATCH] package/conmon: fix libseccomp shared build Drop patch and disable libseccomp when building statically to avoid the following build failure raised since commit 29834d8a12d984e8efe05398c5aaa6a61f7880e0: src/seccomp_notify.c: In function 'seccomp_notify_plugins_load': src/seccomp_notify.c:136:42: warning: implicit declaration of function 'dlopen'; did you mean 'popen'? [-Wimplicit-function-declaration] 136 | ctx->plugins[s].handle = dlopen(it, RTLD_NOW); | ^~~~~~ | popen src/seccomp_notify.c:136:53: error: 'RTLD_NOW' undeclared (first use in this function) 136 | ctx->plugins[s].handle = dlopen(it, RTLD_NOW); | ^~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/13d3b46990720bba8621c922b5dce54ab650e96d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 8144dd1b4cca2d5c89e329b0497f49f512c9caed) Signed-off-by: Peter Korsgaard --- ...01-remove-unused-dlfcn.h-header-file.patch | 26 ------------------- package/conmon/conmon.mk | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 package/conmon/0001-remove-unused-dlfcn.h-header-file.patch diff --git a/package/conmon/0001-remove-unused-dlfcn.h-header-file.patch b/package/conmon/0001-remove-unused-dlfcn.h-header-file.patch deleted file mode 100644 index 14f817942e..0000000000 --- a/package/conmon/0001-remove-unused-dlfcn.h-header-file.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e28634a0e847a14c58482f962bc9b1d69937387f Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Sat, 12 Aug 2023 12:53:37 +0200 -Subject: [PATCH] remove unused dlfcn.h header file - -Signed-off-by: Waldemar Brodkorb -Upstream: https://github.com/containers/conmon/issues/443 ---- - src/seccomp_notify.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/seccomp_notify.c b/src/seccomp_notify.c -index 8d34d9d..2a8371d 100644 ---- a/src/seccomp_notify.c -+++ b/src/seccomp_notify.c -@@ -7,7 +7,6 @@ - - #include - #include --#include - #include - #include - #include --- -2.39.2 - diff --git a/package/conmon/conmon.mk b/package/conmon/conmon.mk index 29deb2af47..50807f8c6a 100644 --- a/package/conmon/conmon.mk +++ b/package/conmon/conmon.mk @@ -11,7 +11,7 @@ CONMON_LICENSE_FILES = LICENSE CONMON_DEPENDENCIES = host-pkgconf libglib2 -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +ifeq ($(BR2_PACKAGE_LIBSECCOMP):$(BR2_STATIC_LIBS),y:) CONMON_DISABLE_SECCOMP = 0 CONMON_DEPENDENCIES += libseccomp else