qemu-virtfs-netbsd: fix build

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

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Sun Sep 17 14:19:46 2023 +0200
Changeset:	b50b68c07902df47a7cc33308d7a569c35f08f63

Modified Files:
	qemu-virtfs-netbsd/Makefile
	qemu-virtfs-netbsd/distinfo
	qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util.h
Added Files:
	qemu-virtfs-netbsd/patches/patch-fsdev_meson.build

Log Message:
qemu-virtfs-netbsd: fix build

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b50b68c07902df47a7cc33308d7a569c35f08f63

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

diffstat:
 qemu-virtfs-netbsd/Makefile                        |  2 +-
 qemu-virtfs-netbsd/distinfo                        |  3 ++-
 qemu-virtfs-netbsd/patches/patch-fsdev_meson.build | 14 ++++++++++++++
 qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util.h |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diffs:
diff --git a/qemu-virtfs-netbsd/Makefile b/qemu-virtfs-netbsd/Makefile
index 858185a688..f6a7ab105d 100644
--- a/qemu-virtfs-netbsd/Makefile
+++ b/qemu-virtfs-netbsd/Makefile
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
 CONFIGURE_ARGS+=	--enable-curses
 CONFIGURE_ARGS+=	--enable-docs
 CONFIGURE_ENV+=		mansuffix=/${PKGMANDIR}
-CONFIGURE_ENV+=		MESON_RSP_THRESHOLD=262144
+ALL_ENV+=		MESON_RSP_THRESHOLD=262144
 
 .if defined(PKGSRC_USE_SSP)
 # do not add flags to everything
diff --git a/qemu-virtfs-netbsd/distinfo b/qemu-virtfs-netbsd/distinfo
index 9043168c92..a8bcce906d 100644
--- a/qemu-virtfs-netbsd/distinfo
+++ b/qemu-virtfs-netbsd/distinfo
@@ -8,12 +8,13 @@ SHA512 (qemu-8.1.0.tar.xz) = c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a00459
 Size (qemu-8.1.0.tar.xz) = 123550284 bytes
 SHA1 (patch-audio_jackaudio.c) = 771c2779e565242a500adc0223ef6b1ae5b2b91f
 SHA1 (patch-fsdev_file-op-9p.h) = 76d29b1975495f671ab5b699958c92855e5f1b67
+SHA1 (patch-fsdev_meson.build) = 39cbbcabae262f7ecfd77e5c2d61da4f37340dfe
 SHA1 (patch-hw-mips-Kconfig) = c7199ad26ac45116ab4d38252db4234ae93bdf9a
 SHA1 (patch-hw-mips-mipssim.c) = 1f682b74b34398b3ff15f9e7f24a85f4b8bb4853
 SHA1 (patch-hw_9pfs_9p-proxy.c) = ce63083f41dcee265e223e4b8a5dd843678347a0
 SHA1 (patch-hw_9pfs_9p-synth.c) = 1fa45cfc58db484a085f78859e10efd83d8719c6
 SHA1 (patch-hw_9pfs_9p-util-bsd.c) = 012bc411103fae3fbf8976803275244b55675111
-SHA1 (patch-hw_9pfs_9p-util.h) = 18a710ac88e6754b5df4b896773a433676190b1b
+SHA1 (patch-hw_9pfs_9p-util.h) = 8bbf2b2b63d24d97859046487804541e33baaf50
 SHA1 (patch-hw_9pfs_9p.c) = 2b9d312a17b1be32a1a0b5a188322a7e0fd56654
 SHA1 (patch-hw_9pfs_9p.h) = 695f764db7ba8412d790f9dff928754891a7469a
 SHA1 (patch-hw_9pfs_meson.build) = c044802ed72729e917d09307b7ddd1e6ebabaf4d
diff --git a/qemu-virtfs-netbsd/patches/patch-fsdev_meson.build b/qemu-virtfs-netbsd/patches/patch-fsdev_meson.build
new file mode 100644
index 0000000000..a69fb512d2
--- /dev/null
+++ b/qemu-virtfs-netbsd/patches/patch-fsdev_meson.build
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Add NetBSD support.
+
+--- fsdev/meson.build.orig	2023-08-22 15:34:01.000000000 +0000
++++ fsdev/meson.build
+@@ -8,6 +8,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], 
+ ), if_false: files('qemu-fsdev-dummy.c'))
+ system_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
+ system_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss)
++system_ss.add_all(when: 'CONFIG_BSD', if_true: fsdev_ss)
+ 
+ if have_virtfs_proxy_helper
+   executable('virtfs-proxy-helper',
diff --git a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util.h b/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util.h
index a4f9a7a5b1..071fc597f7 100644
--- a/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util.h
+++ b/qemu-virtfs-netbsd/patches/patch-hw_9pfs_9p-util.h
@@ -25,7 +25,7 @@ Add NetBSD support.
                       mode);
      if (fd == -1) {
 -#ifndef CONFIG_DARWIN
-+#ifndef CONFIG_LINUX
++#ifdef CONFIG_LINUX
          if (errno == EPERM && (flags & O_NOATIME)) {
              /*
               * The client passed O_NOATIME but we lack permissions to honor it.