From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Aug 2022 17:17:48 +0000 (+0000)
Subject: qemu: Fix build against glibc 2.36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=692416302ca59ba4f94c0da85a66a1ce08c396e5;p=people%2Fms%2Fipfire-2.x.git

qemu: Fix build against glibc 2.36

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/qemu b/lfs/qemu
index cf31c46225..7fe97f9415 100644
--- 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
index 0000000000..9332563bce
--- /dev/null
+++ b/src/patches/qemu-7.0.0-fix-glibc-headers.patch
@@ -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>