CVS commit: pkgsrc/emulators/qemu

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Mar 27 12:42:07 UTC 2023

Modified Files:
        pkgsrc/emulators/qemu: distinfo
Added Files:
        pkgsrc/emulators/qemu/patches: patch-linux-user_syscall.c

Log Message:
qemu: add Linux (glibc) build fix from upstream


To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/qemu/patches/patch-linux-user_syscall.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.199 pkgsrc/emulators/qemu/distinfo:1.200
--- pkgsrc/emulators/qemu/distinfo:1.199        Wed Mar 15 11:49:20 2023
+++ pkgsrc/emulators/qemu/distinfo      Mon Mar 27 12:42:07 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.199 2023/03/15 11:49:20 jperkin Exp $
+$NetBSD: distinfo,v 1.200 2023/03/27 12:42:07 tnn Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -17,6 +17,7 @@ SHA1 (patch-hw_net_xilinx__axienet.c) = 
 SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
 SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
 SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
+SHA1 (patch-linux-user_syscall.c) = eff87b18437340e63dfe0b8914fb6bc6ef2f59e0
 SHA1 (patch-meson.build) = 67fcc428b1953a63e4c0aa32ac1d41ec234a2462
 SHA1 (patch-meson_mesonbuild_linkers_linkers.py) = 842b01f543c99c66630df8450f71ab9fc422ff32
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2

Added files:

Index: pkgsrc/emulators/qemu/patches/patch-linux-user_syscall.c
diff -u /dev/null pkgsrc/emulators/qemu/patches/patch-linux-user_syscall.c:1.1
--- /dev/null   Mon Mar 27 12:42:07 2023
+++ pkgsrc/emulators/qemu/patches/patch-linux-user_syscall.c    Mon Mar 27 12:42:07 2023
@@ -0,0 +1,60 @@
+$NetBSD: patch-linux-user_syscall.c,v 1.1 2023/03/27 12:42:07 tnn Exp $
+
+Linux build fix, from upstream.
+
+https://github.com/qemu/qemu/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a.patch
+https://github.com/qemu/qemu/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e.patch
+
+--- linux-user/syscall.c.orig  2023-03-27 11:55:56.275345431 +0000
++++ linux-user/syscall.c
+@@ -95,50 +95,7 @@
+ #include <linux/soundcard.h>
+ #include <linux/kd.h>
+ #include <linux/mtio.h>
+-
+-#ifdef HAVE_SYS_MOUNT_FSCONFIG
+-/*
+- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h,
+- * which in turn prevents use of linux/fs.h. So we have to
+- * define the constants ourselves for now.
+- */
+-#define FS_IOC_GETFLAGS                _IOR('f', 1, long)
+-#define FS_IOC_SETFLAGS                _IOW('f', 2, long)
+-#define FS_IOC_GETVERSION              _IOR('v', 1, long)
+-#define FS_IOC_SETVERSION              _IOW('v', 2, long)
+-#define FS_IOC_FIEMAP                  _IOWR('f', 11, struct fiemap)
+-#define FS_IOC32_GETFLAGS              _IOR('f', 1, int)
+-#define FS_IOC32_SETFLAGS              _IOW('f', 2, int)
+-#define FS_IOC32_GETVERSION            _IOR('v', 1, int)
+-#define FS_IOC32_SETVERSION            _IOW('v', 2, int)
+-
+-#define BLKGETSIZE64 _IOR(0x12,114,size_t)
+-#define BLKDISCARD _IO(0x12,119)
+-#define BLKIOMIN _IO(0x12,120)
+-#define BLKIOOPT _IO(0x12,121)
+-#define BLKALIGNOFF _IO(0x12,122)
+-#define BLKPBSZGET _IO(0x12,123)
+-#define BLKDISCARDZEROES _IO(0x12,124)
+-#define BLKSECDISCARD _IO(0x12,125)
+-#define BLKROTATIONAL _IO(0x12,126)
+-#define BLKZEROOUT _IO(0x12,127)
+-
+-#define FIBMAP     _IO(0x00,1)
+-#define FIGETBSZ   _IO(0x00,2)
+-
+-struct file_clone_range {
+-        __s64 src_fd;
+-        __u64 src_offset;
+-        __u64 src_length;
+-        __u64 dest_offset;
+-};
+-
+-#define FICLONE         _IOW(0x94, 9, int)
+-#define FICLONERANGE    _IOW(0x94, 13, struct file_clone_range)
+-
+-#else
+ #include <linux/fs.h>
+-#endif
+ #include <linux/fd.h>
+ #if defined(CONFIG_FIEMAP)
+ #include <linux/fiemap.h>