[pkgsrc/trunk]: pkgsrc/emulators/qemu qemu: Fix build on SunOS.

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/31faeee2d4a7
branches:  trunk
changeset: 454729:31faeee2d4a7
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Jun 16 09:39:17 2021 +0000

description:
qemu: Fix build on SunOS.

diffstat:

 emulators/qemu/distinfo                           |   3 +-
 emulators/qemu/patches/patch-hw_i386_acpi-build.c |  24 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diffs (45 lines):

diff -r 9fe667fb21ff -r 31faeee2d4a7 emulators/qemu/distinfo
--- a/emulators/qemu/distinfo   Wed Jun 16 00:08:04 2021 +0000
+++ b/emulators/qemu/distinfo   Wed Jun 16 09:39:17 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.179 2021/06/01 16:28:05 nia Exp $
+$NetBSD: distinfo,v 1.180 2021/06/16 09:39:17 jperkin Exp $
 
 SHA1 (palcode-clipper-qemu-5.2.0nb8) = ddbf1dffb7c2b2157e0bbe9fb7db7e57105130b1
 RMD160 (palcode-clipper-qemu-5.2.0nb8) = 3f9fe19a40f7ca72ecfe047d1449e55b63cba3ee
@@ -18,6 +18,7 @@
 SHA1 (patch-hw_alpha_typhoon.c) = 1bed5cd6f355c4163585c5331356ebf38c5c3a16
 SHA1 (patch-hw_core_uboot__image.h) = 17eef02349343c5fcfb7a4069cb6f8fd11efcb59
 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
+SHA1 (patch-hw_i386_acpi-build.c) = 7d23d09f71917cedca4226fd22baa45bcb0f7d33
 SHA1 (patch-hw_mips_meson.build) = ff4bec33d9d2f86a425e02928aa3b6963c22da68
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
diff -r 9fe667fb21ff -r 31faeee2d4a7 emulators/qemu/patches/patch-hw_i386_acpi-build.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/qemu/patches/patch-hw_i386_acpi-build.c Wed Jun 16 09:39:17 2021 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-hw_i386_acpi-build.c,v 1.1 2021/06/16 09:39:17 jperkin Exp $
+
+Avoid "sun" define.
+
+--- hw/i386/acpi-build.c.orig  2021-04-29 17:18:58.000000000 +0000
++++ hw/i386/acpi-build.c
+@@ -534,7 +534,7 @@ Aml *aml_pci_device_dsm(void)
+     Aml *bnum = aml_arg(4);
+     Aml *func = aml_arg(2);
+     Aml *rev = aml_arg(1);
+-    Aml *sun = aml_arg(5);
++    Aml *qsun = aml_arg(5);
+ 
+     method = aml_method("PDSM", 6, AML_SERIALIZED);
+ 
+@@ -545,7 +545,7 @@ Aml *aml_pci_device_dsm(void)
+     UUID = aml_touuid("E5C937D0-3553-4D7A-9117-EA4D19C3434D");
+     ifctx = aml_if(aml_equal(aml_arg(0), UUID));
+     {
+-        aml_append(ifctx, aml_store(aml_call2("AIDX", bnum, sun), acpi_index));
++        aml_append(ifctx, aml_store(aml_call2("AIDX", bnum, qsun), acpi_index));
+         ifctx1 = aml_if(aml_equal(func, zero));
+         {
+             uint8_t byte_list[1];