Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/conmon: fix static build
@ 2023-11-01 17:45 Fabrice Fontaine
  2023-11-01 17:52 ` Thomas Petazzoni via buildroot
  2023-11-08  7:22 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2023-11-01 17:45 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine, Christian Stewart

Fix the following static build failure raised since commit
8144dd1b4cca2d5c89e329b0497f49f512c9caed which fixed dynamic build but
broke static build:

src/seccomp_notify.c:10:10: fatal error: dlfcn.h: No such file or directory
   10 | #include <dlfcn.h>
      |          ^~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/71b4f35b3150183c7b44bc3897f01b0019e10ebe

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...rc-seccomp_notify.c-fix-static-build.patch | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 package/conmon/0001-src-seccomp_notify.c-fix-static-build.patch

diff --git a/package/conmon/0001-src-seccomp_notify.c-fix-static-build.patch b/package/conmon/0001-src-seccomp_notify.c-fix-static-build.patch
new file mode 100644
index 0000000000..afffa909c8
--- /dev/null
+++ b/package/conmon/0001-src-seccomp_notify.c-fix-static-build.patch
@@ -0,0 +1,44 @@
+From 6cfcea9a16017f2a49cd792d39ebd9c86395946a Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Wed, 1 Nov 2023 16:45:21 +0100
+Subject: [PATCH] src/seccomp_notify.c: fix static build
+
+Fix the following static build failure raised even when seccomp is
+disabled:
+
+src/seccomp_notify.c:10:10: fatal error: dlfcn.h: No such file or directory
+   10 | #include <dlfcn.h>
+      |          ^~~~~~~~~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/71b4f35b3150183c7b44bc3897f01b0019e10ebe
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Upstream: https://github.com/containers/conmon/issues/462
+---
+ src/seccomp_notify.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/seccomp_notify.c b/src/seccomp_notify.c
+index 8d34d9d..bf738ea 100644
+--- a/src/seccomp_notify.c
++++ b/src/seccomp_notify.c
+@@ -7,7 +7,6 @@
+ 
+ #include <errno.h>
+ #include <sys/ioctl.h>
+-#include <dlfcn.h>
+ #include <sys/wait.h>
+ #include <sys/mount.h>
+ #include <signal.h>
+@@ -19,6 +18,7 @@
+ 
+ #ifdef USE_SECCOMP
+ 
++#include <dlfcn.h>
+ #include <sys/sysmacros.h>
+ #include <linux/seccomp.h>
+ #include <seccomp.h>
+-- 
+2.42.0
+
-- 
2.42.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/conmon: fix static build
  2023-11-01 17:45 [Buildroot] [PATCH 1/1] package/conmon: fix static build Fabrice Fontaine
@ 2023-11-01 17:52 ` Thomas Petazzoni via buildroot
  2023-11-08  7:22 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-11-01 17:52 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Christian Stewart, buildroot

On Wed,  1 Nov 2023 18:45:19 +0100
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Fix the following static build failure raised since commit
> 8144dd1b4cca2d5c89e329b0497f49f512c9caed which fixed dynamic build but
> broke static build:
> 
> src/seccomp_notify.c:10:10: fatal error: dlfcn.h: No such file or directory
>    10 | #include <dlfcn.h>
>       |          ^~~~~~~~~
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/71b4f35b3150183c7b44bc3897f01b0019e10ebe
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...rc-seccomp_notify.c-fix-static-build.patch | 44 +++++++++++++++++++
>  1 file changed, 44 insertions(+)
>  create mode 100644 package/conmon/0001-src-seccomp_notify.c-fix-static-build.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/conmon: fix static build
  2023-11-01 17:45 [Buildroot] [PATCH 1/1] package/conmon: fix static build Fabrice Fontaine
  2023-11-01 17:52 ` Thomas Petazzoni via buildroot
@ 2023-11-08  7:22 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2023-11-08  7:22 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: Christian Stewart, buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fix the following static build failure raised since commit
 > 8144dd1b4cca2d5c89e329b0497f49f512c9caed which fixed dynamic build but
 > broke static build:

 > src/seccomp_notify.c:10:10: fatal error: dlfcn.h: No such file or directory
 >    10 | #include <dlfcn.h>
 >       |          ^~~~~~~~~

 > Fixes:
 >  - http://autobuild.buildroot.org/results/71b4f35b3150183c7b44bc3897f01b0019e10ebe

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2023.08.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-11-08  7:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-01 17:45 [Buildroot] [PATCH 1/1] package/conmon: fix static build Fabrice Fontaine
2023-11-01 17:52 ` Thomas Petazzoni via buildroot
2023-11-08  7:22 ` Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox