]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
qemu: Fix build against glibc 2.36
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Aug 2022 17:17:48 +0000 (17:17 +0000)
committerPeter Müller <peter.mueller@ipfire.org>
Sun, 11 Sep 2022 08:36:17 +0000 (08:36 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/qemu
src/patches/qemu-7.0.0-fix-glibc-headers.patch [new file with mode: 0644]

index cf31c46225f6fa77b13f7d994a88edfac6fa0591..7fe97f94151bf7a4824de13a62030752147a7d81 100644 (file)
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -94,6 +94,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-7.0.0-fix-glibc-headers.patch
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc \
diff --git a/src/patches/qemu-7.0.0-fix-glibc-headers.patch b/src/patches/qemu-7.0.0-fix-glibc-headers.patch
new file mode 100644 (file)
index 0000000..9332563
--- /dev/null
@@ -0,0 +1,11 @@
+--- qemu-7.0.0/linux-user/syscall.c~   2022-08-10 14:03:50.721401251 +0000
++++ qemu-7.0.0/linux-user/syscall.c    2022-08-10 14:00:22.569951783 +0000
+@@ -28,7 +28,7 @@
+ #include <sys/ipc.h>
+ #include <sys/msg.h>
+ #include <sys/wait.h>
+-#include <sys/mount.h>
++#include <linux/mount.h>
+ #include <sys/file.h>
+ #include <sys/fsuid.h>
+ #include <sys/personality.h>