CVS commit: pkgsrc/emulators/qemu

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jul  9 21:08:33 UTC 2021

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

Log Message:
Apply upstream commit 75eebe0 to fix macOS Big Sur build (working around
C++ "version" vs. "VERSION" crud).


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.6 -r1.7 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.181 pkgsrc/emulators/qemu/distinfo:1.182
--- pkgsrc/emulators/qemu/distinfo:1.181        Tue Jun 22 04:09:06 2021
+++ pkgsrc/emulators/qemu/distinfo      Fri Jul  9 21:08:33 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.181 2021/06/22 04:09:06 thorpej Exp $
+$NetBSD: distinfo,v 1.182 2021/07/09 21:08:33 schmonz Exp $
 
 SHA1 (palcode-clipper-qemu-5.2.0nb8) = ddbf1dffb7c2b2157e0bbe9fb7db7e57105130b1
 RMD160 (palcode-clipper-qemu-5.2.0nb8) = 3f9fe19a40f7ca72ecfe047d1449e55b63cba3ee
@@ -28,7 +28,7 @@ SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a
 SHA1 (patch-include_sysemu_hw__accel.h) = a3cd022368a074e30dd3958932a006fa0fe011a6
 SHA1 (patch-include_sysemu_kvm.h) = 9847abe3be70bd708a521310f5d5515e45a1a5a0
 SHA1 (patch-include_sysemu_nvmm.h) = 7e49abdc7dc6a03f293780c63ac6c242d3914d15
-SHA1 (patch-meson.build) = fe1ef65033aa387a8b029d3db206a04e341644d5
+SHA1 (patch-meson.build) = ec26f7df6789ac6880ac2ac1f8b0f22ec9bb31f5
 SHA1 (patch-meson__options.txt) = 050adf1d5c07dc211fdafde7a21e2afe52db9169
 SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5
 SHA1 (patch-nvmm-accel-ops.c) = 23ef13420a61d8bfa78f36ed7eae2e1523464617

Index: pkgsrc/emulators/qemu/patches/patch-meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-meson.build:1.6 pkgsrc/emulators/qemu/patches/patch-meson.build:1.7
--- pkgsrc/emulators/qemu/patches/patch-meson.build:1.6 Mon May 24 14:22:08 2021
+++ pkgsrc/emulators/qemu/patches/patch-meson.build     Fri Jul  9 21:08:33 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.6 2021/05/24 14:22:08 ryoon Exp $
+$NetBSD: patch-meson.build,v 1.7 2021/07/09 21:08:33 schmonz Exp $
 
 * Add NetBSD support.
 * Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
@@ -66,7 +66,15 @@ $NetBSD: patch-meson.build,v 1.6 2021/05
        # 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.
-@@ -2576,6 +2589,7 @@ if have_system
+@@ -2129,6 +2142,7 @@ common_all = common_ss.apply(config_all,
+ common_all = static_library('common',
+                             build_by_default: false,
+                             sources: common_all.sources() + genh,
++                            implicit_include_directories: false,
+                             dependencies: common_all.dependencies(),
+                             name_suffix: 'fa')
+ 
+@@ -2576,6 +2590,7 @@ if have_system
    summary_info += {'HAX support':       config_all.has_key('CONFIG_HAX')}
    summary_info += {'HVF support':       config_all.has_key('CONFIG_HVF')}
    summary_info += {'WHPX support':      config_all.has_key('CONFIG_WHPX')}