diff options
| author | schmonz <schmonz@pkgsrc.org> | 2021-07-09 21:08:33 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2021-07-09 21:08:33 +0000 |
| commit | d8f7b2f488ea6d43e2614b35bb7ac32e9b3360d4 (patch) | |
| tree | 8325505447fb71ded56f126bd532f3b97eaa64ff /emulators | |
| parent | 78536370d5d9f81d30a3ff617927f3ee0d87c0cb (diff) | |
| download | pkgsrc-d8f7b2f488ea6d43e2614b35bb7ac32e9b3360d4.tar.gz | |
Apply upstream commit 75eebe0 to fix macOS Big Sur build (working around
C++ "version" vs. "VERSION" crud).
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/qemu/distinfo | 4 | ||||
| -rw-r--r-- | emulators/qemu/patches/patch-meson.build | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo index f3bb7880e62..2414809504c 100644 --- a/emulators/qemu/distinfo +++ b/emulators/qemu/distinfo @@ -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) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43 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 diff --git a/emulators/qemu/patches/patch-meson.build b/emulators/qemu/patches/patch-meson.build index 6774be80506..4875d930ac7 100644 --- a/emulators/qemu/patches/patch-meson.build +++ b/emulators/qemu/patches/patch-meson.build @@ -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/24 14:22:08 ryoon Exp $ # 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')} |