CVS commit: pkgsrc/emulators/qemu

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sun Sep 10 16:16:14 UTC 2023

Modified Files:
        pkgsrc/emulators/qemu: distinfo
        pkgsrc/emulators/qemu/patches: patch-meson.build

Log Message:
qemu: Spell 'sunos' correctly.

Submitted upstream, should be fixed in next release.


To generate a diff of this commit:
cvs rdiff -u -r1.208 -r1.209 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/emulators/qemu/patches/patch-meson.build

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.208 pkgsrc/emulators/qemu/distinfo:1.209
--- pkgsrc/emulators/qemu/distinfo:1.208        Wed Aug 23 15:19:02 2023
+++ pkgsrc/emulators/qemu/distinfo      Sun Sep 10 16:16:14 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.208 2023/08/23 15:19:02 adam Exp $
+$NetBSD: distinfo,v 1.209 2023/09/10 16:16:14 jperkin Exp $
 
 BLAKE2s (palcode-clipper-qemu-5.2.0nb8) = d388c896a80c1cc3d4785c8434d6688bbcfd54c28f7252ce550ab162a0bba321
 SHA512 (palcode-clipper-qemu-5.2.0nb8) = 33695d6001d86a19793a92d5e31775607c4dfc9ab9eea019ea6c4d543a2e11e8c07f83cca4934811a13ef829b528737ea37d9d2aaf66cba6f2746d44d2aa0b43
@@ -16,7 +16,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-meson.build) = 0a3e28d8bf6bf6be311787d964ac4694c58c2fca
+SHA1 (patch-meson.build) = edece4d8e02193230732de390bebeac43fba7d5f
 SHA1 (patch-roms_u-boot-sam460ex_Makefile) = 3a1bbf19b1422c10ebdd819eb0b711fafc78e2f2
 SHA1 (patch-target_arm_tcg_translate-sve.c) = b5eeb08331e61a16b2cf4b7ab9b668755aa9a04e
 SHA1 (patch-target_i386_cpu.c) = afa8a2f83399b2d142709322eb88d1112f1547e4

Index: pkgsrc/emulators/qemu/patches/patch-meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-meson.build:1.12 pkgsrc/emulators/qemu/patches/patch-meson.build:1.13
--- pkgsrc/emulators/qemu/patches/patch-meson.build:1.12        Wed Aug 23 15:19:02 2023
+++ pkgsrc/emulators/qemu/patches/patch-meson.build     Sun Sep 10 16:16:14 2023
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.12 2023/08/23 15:19:02 adam Exp $
+$NetBSD: patch-meson.build,v 1.13 2023/09/10 16:16:14 jperkin Exp $
 
 * Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
   to fix qemu-system-aarch64 link.
@@ -6,6 +6,15 @@ $NetBSD: patch-meson.build,v 1.12 2023/0
 
 --- meson.build.orig   2023-08-22 15:34:02.000000000 +0000
 +++ meson.build
+@@ -225,7 +225,7 @@ if targetos == 'darwin'
+   # Disable attempts to use ObjectiveC features in os/object.h since they
+   # won't work when we're compiling with gcc as a C compiler.
+   qemu_common_flags += '-DOS_OBJECT_USE_OBJC=0'
+-elif targetos == 'solaris'
++elif targetos == 'sunos'
+   # needed for CMSG_ macros in sys/socket.h
+   qemu_common_flags += '-D_XOPEN_SOURCE=600'
+   # needed for TIOCWIN* defines in termios.h
 @@ -1184,7 +1184,7 @@ if have_system and get_option('curses').
        has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
      endif
@@ -24,3 +33,12 @@ $NetBSD: patch-meson.build,v 1.12 2023/0
        # Programs will be linked with glib and this will bring in libiconv on FreeBSD.
        # We need to use libiconv if available because mixing libiconv's headers with
        # the system libc does not work.
+@@ -2056,7 +2056,7 @@ have_slirp_smbd = get_option('slirp_smbd
+ if have_slirp_smbd
+   smbd_path = get_option('smbd')
+   if smbd_path == ''
+-    smbd_path = (targetos == 'solaris' ? '/usr/sfw/sbin/smbd' : '/usr/sbin/smbd')
++    smbd_path = (targetos == 'sunos' ? '/usr/sfw/sbin/smbd' : '/usr/sbin/smbd')
+   endif
+   config_host_data.set_quoted('CONFIG_SMBD_COMMAND', smbd_path)
+ endif