diff options
author | Qiu Wenbo | 2022-09-01 10:25:07 +0800 |
---|---|---|
committer | Qiu Wenbo | 2022-09-01 10:25:07 +0800 |
commit | daa715fa3c2b27c59ebcddd70a630cafa8b10718 (patch) | |
tree | 6038459ab87c6cad9250df304aac40febd00e694 | |
parent | 65d989927335359dad502cc897284c5eea7ace27 (diff) | |
download | aur-daa715fa3c2b27c59ebcddd70a630cafa8b10718.tar.gz |
remove unused patch
-rw-r--r-- | qemu-7.0.0-glibc-2.36.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/qemu-7.0.0-glibc-2.36.patch b/qemu-7.0.0-glibc-2.36.patch deleted file mode 100644 index 21b09da92cf2..000000000000 --- a/qemu-7.0.0-glibc-2.36.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index b27a6552aa..52d178afe7 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -95,7 +95,25 @@ - #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) -+#else - #include <linux/fs.h> -+#endif - #include <linux/fd.h> - #if defined(CONFIG_FIEMAP) - #include <linux/fiemap.h> -diff --git a/meson.build b/meson.build -index 294e9a8f32..30a380752c 100644 ---- a/meson.build -+++ b/meson.build -@@ -1963,6 +1963,8 @@ config_host_data.set('HAVE_OPTRESET', - cc.has_header_symbol('getopt.h', 'optreset')) - config_host_data.set('HAVE_IPPROTO_MPTCP', - cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP')) -+config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG', -+ cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG')) - - # has_member - config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', |