summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2019-06-28 17:11:14 +0000
committerjperkin <jperkin@pkgsrc.org>2019-06-28 17:11:14 +0000
commit5f419fc7bcdd81fedf98a0c97b3093afb2471dce (patch)
tree228aae585967f2fb76416e48ff7d0a56e8fa6c12 /emulators
parentaeea3a043a08e81da60ab244e56c34e6ecb1d39d (diff)
downloadpkgsrc-5f419fc7bcdd81fedf98a0c97b3093afb2471dce.tar.gz
qemu: Build fix on systems without O_DIRECTORY.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/qemu/distinfo4
-rw-r--r--emulators/qemu/patches/patch-hw_usb_dev-mtp.c14
2 files changed, 14 insertions, 4 deletions
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 389e82b4438..43f56c137fc 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.148 2019/04/27 18:00:46 kamil Exp $
+$NetBSD: distinfo,v 1.149 2019/06/28 17:11:14 jperkin Exp $
SHA1 (qemu-4.0.0.tar.xz) = 74cfb8f4724d9651fdd354560f2d291887b32cad
RMD160 (qemu-4.0.0.tar.xz) = 58135f00c391823edce780d55a816f29dd73c34b
@@ -14,7 +14,7 @@ SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
SHA1 (patch-hw_tpm_tpm__ioctl.h) = f99aa2912a2229b4ae52d3a0a8f2a7b15756c9be
-SHA1 (patch-hw_usb_dev-mtp.c) = c48e11fbe3a017f0e9f8dbd7bf46898b758ab79c
+SHA1 (patch-hw_usb_dev-mtp.c) = 0f9034fb3904e5d5e3b98d24b94e054181687d95
SHA1 (patch-include_sysemu_kvm.h) = f99e8ad021f6c8e89e3ca52538bd9b0656e6f619
SHA1 (patch-roms_u-boot_tools_imx8m__image.sh) = e4c452062f40569e33aa93eec4a65bd3af2e74fc
SHA1 (patch-target_hppa_insns.decode) = 111ad3d5db1c46fd42bb033ac09db377303d352e
diff --git a/emulators/qemu/patches/patch-hw_usb_dev-mtp.c b/emulators/qemu/patches/patch-hw_usb_dev-mtp.c
index cc8fcd60054..ef27d99303e 100644
--- a/emulators/qemu/patches/patch-hw_usb_dev-mtp.c
+++ b/emulators/qemu/patches/patch-hw_usb_dev-mtp.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-hw_usb_dev-mtp.c,v 1.3 2019/04/24 13:59:32 ryoon Exp $
+$NetBSD: patch-hw_usb_dev-mtp.c,v 1.4 2019/06/28 17:11:14 jperkin Exp $
-Support NAME_MAX.
+Support NAME_MAX and compat for O_DIRECTORY.
--- hw/usb/dev-mtp.c.orig 2019-04-23 18:14:46.000000000 +0000
+++ hw/usb/dev-mtp.c
@@ -15,3 +15,13 @@ Support NAME_MAX.
/* ----------------------------------------------------------------------- */
enum mtp_container_type {
+@@ -614,6 +618,9 @@ static void usb_mtp_object_readdir(MTPSt
+ }
+ o->have_children = true;
+
++#ifndef O_DIRECTORY
++#define O_DIRECTORY 0
++#endif
+ fd = open(o->path, O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
+ if (fd < 0) {
+ return;