2 files changed, 58 insertions, 1 deletions

diff --git a/recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch b/recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch
new file mode 100644
index 00000000..b7a2bb05
--- /dev/null
+++ b/recipes-containers/lxc/files/0001-build-Check-if-P_PIDFD-is-defined.patch
@@ -0,0 +1,56 @@
+From 4d00d4f8046972907ef34ac5677d07ae39f3aded Mon Sep 17 00:00:00 2001
+From: Jaeyoon Jung <jaeyoon.jung@lge.com>
+Date: Sun, 30 Nov 2025 11:51:13 +0900
+Subject: [PATCH] build: Check if P_PIDFD is defined
+
+It is defined in enum 'idtype_t' in some environment in which causes an
+error like:
+../git/src/lxc/process_utils.h:144:17: error: expected identifier before numeric constant
+  144 | #define P_PIDFD 3
+      |                 ^
+
+Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com>
+Upstream-Status: Submitted [https://github.com/lxc/lxc/pull/4614]
+---
+ meson.build             | 11 +++++++++++
+ src/lxc/process_utils.h |  2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index ec7524c2..4b3a8f07 100644
+--- a/meson.build
++++ b/meson.build
+@@ -521,6 +521,17 @@ foreach ccattr: [
+     srcconf.set10('HAVE_COMPILER_ATTR_' + ccattr.underscorify().to_upper(), cc.has_function_attribute(ccattr))
+ endforeach
+ 
++## P_PIDFD
++test_code = '''
++#include <sys/wait.h>
++void func() { siginfo_t s; int r = waitid(P_PIDFD, 0, &s, 0); }
++'''
++if cc.compiles(test_code, name: 'waitid(P_PIDFD, ...)')
++    srcconf.set('HAVE_P_PIDFD', 1)
++  else
++    srcconf.set('HAVE_P_PIDFD', 0)
++endif
++
+ ## Headers.
+ foreach ident: [
+     ['bpf',               '''#include <sys/syscall.h>
+diff --git a/src/lxc/process_utils.h b/src/lxc/process_utils.h
+index effff9bd..f4f53a23 100644
+--- a/src/lxc/process_utils.h
++++ b/src/lxc/process_utils.h
+@@ -139,7 +139,7 @@
+ #endif
+ 
+ /* waitid */
+-#if !HAVE_SYS_PIDFD_H
++#if !HAVE_P_PIDFD
+ #ifndef P_PIDFD
+ #define P_PIDFD 3
+ #endif
+-- 
+2.47.2
+
diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb
index 2f0e8e74..d6f137d3 100644
--- a/recipes-containers/lxc/lxc_git.bb
+++ b/recipes-containers/lxc/lxc_git.bb
@@ -45,11 +45,12 @@ SRC_URI = "git://github.com/lxc/lxc.git;branch=stable-6.0;protocol=https \
         file://0001-download-don-t-try-compatbility-index.patch \
         file://tests-our-init-is-not-busybox.patch \
         file://0001-template-if-busybox-contains-init-use-it-in-containe.patch \
+        file://0001-build-Check-if-P_PIDFD-is-defined.patch \
         file://dnsmasq.conf \
         file://lxc-net \
         "
 
-SRCREV = "9e4e69ed1cb93159b0da99dad8d320b795887d07"
+SRCREV = "f9ff9ea2a92653a823edf25e8e28c9dab08b3090"
 PV = "v6.0.5"
 
 # Let's not configure for the host distro.