[packages/qemu] upstream patch to fix build with glibc >= 2.41
atler
atler at pld-linux.org
Sat Mar 29 19:17:54 CET 2025
commit c4086fdbf4869ad9451977791944da3bc830579c
Author: Jan Palus <atler at pld-linux.org>
Date: Sat Mar 29 18:57:28 2025 +0100
upstream patch to fix build with glibc >= 2.41
glibc2.41.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
qemu.spec | 2 ++
2 files changed, 52 insertions(+)
---
diff --git a/qemu.spec b/qemu.spec
index 9b29a10..65503eb 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -75,6 +75,7 @@ Patch5: %{name}-u2f-emu.patch
Patch6: %{name}-linux-mount.patch
Patch7: libvfio-user-types.patch
Patch8: libvfio-user-alloca.patch
+Patch9: glibc2.41.patch
URL: https://www.qemu.org/
%{?with_opengl:BuildRequires: Mesa-libgbm-devel}
%{?with_opengl:BuildRequires: OpenGL-GLX-devel}
@@ -1040,6 +1041,7 @@ Pliki nagłówkowe biblioteki vfio-user.
%patch -P6 -p1
%patch -P7 -p1
%patch -P8 -p1
+%patch -P9 -p1
%{__sed} -i '1s,/usr/bin/env python3,%{__python3},' scripts/qemu-trace-stap
diff --git a/glibc2.41.patch b/glibc2.41.patch
new file mode 100644
index 0000000..58dffb8
--- /dev/null
+++ b/glibc2.41.patch
@@ -0,0 +1,50 @@
+From 27a8d899c7a100fd5aa040a8b993bb257687c393 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem at gmail.com>
+Date: Fri, 7 Feb 2025 16:09:20 +0000
+Subject: [PATCH] linux-user: Do not define struct sched_attr if libc headers
+ do
+
+glibc 2.41+ has added [1] definitions for sched_setattr and
+sched_getattr functions and struct sched_attr. Therefore, it needs
+to be checked for here as well before defining sched_attr, to avoid
+a compilation failure.
+
+Define sched_attr conditionally only when SCHED_ATTR_SIZE_VER0 is
+not defined.
+
+[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2799
+Cc: qemu-stable at nongnu.org
+Reviewed-by: Peter Maydell <peter.maydell at linaro.org>
+Signed-off-by: Peter Maydell <peter.maydell at linaro.org>
+---
+ linux-user/syscall.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/linux-user/syscall.c b/linux-user/syscall.c
+index 6ee02383daf..df5ed18062c 100644
+--- a/linux-user/syscall.c
++++ b/linux-user/syscall.c
+@@ -360,7 +360,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,
+ #define __NR_sys_sched_setaffinity __NR_sched_setaffinity
+ _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len,
+ unsigned long *, user_mask_ptr);
+-/* sched_attr is not defined in glibc */
++/* sched_attr is not defined in glibc < 2.41 */
++#ifndef SCHED_ATTR_SIZE_VER0
+ struct sched_attr {
+ uint32_t size;
+ uint32_t sched_policy;
+@@ -373,6 +374,7 @@ struct sched_attr {
+ uint32_t sched_util_min;
+ uint32_t sched_util_max;
+ };
++#endif
+ #define __NR_sys_sched_getattr __NR_sched_getattr
+ _syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr,
+ unsigned int, size, unsigned int, flags);
+--
+GitLab
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qemu.git/commitdiff/c4086fdbf4869ad9451977791944da3bc830579c
More information about the pld-cvs-commit
mailing list