Sun Mar 14 11:16:45 2021 UTC ()
Fix build on NetBSD machines that don't have NVMM capabilities. The logic
would select the nvmm library when it wasn't disabled that later was not
found.

While here, also fix a curses issue introduced in version 5.2.0nb2; it would
not find the appropriate library.


(reinoud)
diff -r1.266 -r1.267 pkgsrc/emulators/qemu/Makefile
diff -r1.173 -r1.174 pkgsrc/emulators/qemu/distinfo
diff -r1.3 -r1.4 pkgsrc/emulators/qemu/patches/patch-meson.build
cvs diff -r1.266 -r1.267 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2021/03/06 21:50:34 1.266
+++ pkgsrc/emulators/qemu/Makefile 2021/03/14 11:16:45 1.267
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1# $NetBSD: Makefile,v 1.266 2021/03/06 21:50:34 leot Exp $ 1# $NetBSD: Makefile,v 1.267 2021/03/14 11:16:45 reinoud Exp $
2 2
3DISTNAME= qemu-5.2.0 3DISTNAME= qemu-5.2.0
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= https://download.qemu.org/ 6MASTER_SITES= https://download.qemu.org/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu-project.org/ 10HOMEPAGE= http://www.qemu-project.org/
11COMMENT= CPU emulator using dynamic translation 11COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 13
14BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build 14BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
15 15
16USE_CURSES= resize_term wide 16USE_CURSES= resize_term wide
17USE_LANGUAGES+= c c++ 17USE_LANGUAGES+= c c++
18USE_TOOLS+= bison flex gmake makeinfo perl:build pod2man pkg-config 18USE_TOOLS+= bison flex gmake makeinfo perl:build pod2man pkg-config
 19FAKE_NCURSES= yes
19UNLIMIT_RESOURCES= datasize 20UNLIMIT_RESOURCES= datasize
20HAS_CONFIGURE= yes 21HAS_CONFIGURE= yes
21 22
22GMAKE_REQD= 4.1 # needed for docs 23GMAKE_REQD= 4.1 # needed for docs
23 24
24PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool 25PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
25 26
26SUBST_CLASSES+= sphinx-build 27SUBST_CLASSES+= sphinx-build
27SUBST_STAGE.sphinx-build= pre-configure 28SUBST_STAGE.sphinx-build= pre-configure
28SUBST_MESSAGE.sphinx-build= Fix hardcoded sphinx-build 29SUBST_MESSAGE.sphinx-build= Fix hardcoded sphinx-build
29SUBST_FILES.sphinx-build+= configure 30SUBST_FILES.sphinx-build+= configure
30SUBST_FILES.sphinx-build+= docs/meson.build 31SUBST_FILES.sphinx-build+= docs/meson.build
31SUBST_FILES.sphinx-build+= roms/skiboot/doc/Makefile 32SUBST_FILES.sphinx-build+= roms/skiboot/doc/Makefile
@@ -163,26 +164,26 @@ post-install: @@ -163,26 +164,26 @@ post-install:
163 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo 164 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/interop/.buildinfo
164 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/specs/.buildinfo 165 ${RM} -f ${DESTDIR}${PREFIX}/share/doc/qemu/specs/.buildinfo
165 ${RM} -f ${WRKDIR}/PLIST.STATIC 166 ${RM} -f ${WRKDIR}/PLIST.STATIC
166 cd ${DESTDIR}${PREFIX} && \ 167 cd ${DESTDIR}${PREFIX} && \
167 ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC 168 ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC
168 169
169# On Darwin, qemu uses CoreAudio 170# On Darwin, qemu uses CoreAudio
170.if ${OPSYS} != "Darwin" 171.if ${OPSYS} != "Darwin"
171.include "../../mk/oss.buildlink3.mk" 172.include "../../mk/oss.buildlink3.mk"
172.endif 173.endif
173.include "../../archivers/lzo/buildlink3.mk" 174.include "../../archivers/lzo/buildlink3.mk"
174.include "../../devel/glib2/buildlink3.mk" 175.include "../../devel/glib2/buildlink3.mk"
175.include "../../devel/jemalloc/buildlink3.mk" 176.include "../../devel/jemalloc/buildlink3.mk"
 177.include "../../devel/ncursesw/buildlink3.mk"
176.include "../../devel/snappy/buildlink3.mk" 178.include "../../devel/snappy/buildlink3.mk"
177.include "../../devel/zlib/buildlink3.mk" 179.include "../../devel/zlib/buildlink3.mk"
178.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 180.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
179.include "../../graphics/png/buildlink3.mk" 181.include "../../graphics/png/buildlink3.mk"
180.include "../../lang/python/extension.mk" 182.include "../../lang/python/extension.mk"
181.include "../../lang/python/versioned_dependencies.mk" 183.include "../../lang/python/versioned_dependencies.mk"
182.include "../../security/libgcrypt/buildlink3.mk" 184.include "../../security/libgcrypt/buildlink3.mk"
183.include "../../www/curl/buildlink3.mk" 185.include "../../www/curl/buildlink3.mk"
184.include "../../x11/pixman/buildlink3.mk" 186.include "../../x11/pixman/buildlink3.mk"
185.include "../../mk/curses.buildlink3.mk" 
186.include "../../mk/jpeg.buildlink3.mk" 187.include "../../mk/jpeg.buildlink3.mk"
187.include "../../mk/pthread.buildlink3.mk" 188.include "../../mk/pthread.buildlink3.mk"
188.include "../../mk/bsd.pkg.mk" 189.include "../../mk/bsd.pkg.mk"
cvs diff -r1.173 -r1.174 pkgsrc/emulators/qemu/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/distinfo 2021/03/06 21:50:34 1.173
+++ pkgsrc/emulators/qemu/distinfo 2021/03/14 11:16:45 1.174
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.173 2021/03/06 21:50:34 leot Exp $ 1$NetBSD: distinfo,v 1.174 2021/03/14 11:16:45 reinoud Exp $
2 2
3SHA1 (palcode-clipper) = e25ae10a10e0801e47b62b9ee2d10c8ccb4ee940 3SHA1 (palcode-clipper) = e25ae10a10e0801e47b62b9ee2d10c8ccb4ee940
4RMD160 (palcode-clipper) = a637f1cc38dabfdff36e3f02b6dd02d7c63cb8db 4RMD160 (palcode-clipper) = a637f1cc38dabfdff36e3f02b6dd02d7c63cb8db
5SHA512 (palcode-clipper) = 8d6966e59b59bc17c563bae3648af4ac99108990294edd0398ee91d8e61ec8f890608b9326b175d6a3a5668106b67b019a2c51b79f5b2935d4a516d34490056c 5SHA512 (palcode-clipper) = 8d6966e59b59bc17c563bae3648af4ac99108990294edd0398ee91d8e61ec8f890608b9326b175d6a3a5668106b67b019a2c51b79f5b2935d4a516d34490056c
6Size (palcode-clipper) = 156704 bytes 6Size (palcode-clipper) = 156704 bytes
7SHA1 (qemu-5.2.0.tar.xz) = 146578267387e301423502d19024f8ffe35ab332 7SHA1 (qemu-5.2.0.tar.xz) = 146578267387e301423502d19024f8ffe35ab332
8RMD160 (qemu-5.2.0.tar.xz) = 2c33e773f012e333f99237e3d4ff1653ea0bc88f 8RMD160 (qemu-5.2.0.tar.xz) = 2c33e773f012e333f99237e3d4ff1653ea0bc88f
9SHA512 (qemu-5.2.0.tar.xz) = bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3 9SHA512 (qemu-5.2.0.tar.xz) = bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3
10Size (qemu-5.2.0.tar.xz) = 106902800 bytes 10Size (qemu-5.2.0.tar.xz) = 106902800 bytes
11SHA1 (patch-accel_stubs_nvmm-stub.c) = d66d47eabb8bb6728e777da7589b43d491adbcc8 11SHA1 (patch-accel_stubs_nvmm-stub.c) = d66d47eabb8bb6728e777da7589b43d491adbcc8
12SHA1 (patch-backends_tpm_tpm__ioctl.h) = fbd6c877ad605f7120290efbb0ac653c69f351de 12SHA1 (patch-backends_tpm_tpm__ioctl.h) = fbd6c877ad605f7120290efbb0ac653c69f351de
13SHA1 (patch-configure) = 8b392c5633c70d65f2f27af3b617a53af9772899 13SHA1 (patch-configure) = 8b392c5633c70d65f2f27af3b617a53af9772899
14SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984 14SHA1 (patch-contrib_ivshmem-client_ivshmem-client.c) = 40c8751607cbf66a37e4c4e08f2664b864e2e984
@@ -19,27 +19,27 @@ SHA1 (patch-hw_alpha_alpha_sys.h) = 5908 @@ -19,27 +19,27 @@ SHA1 (patch-hw_alpha_alpha_sys.h) = 5908
19SHA1 (patch-hw_alpha_dp264.c) = 856304784f098863728ecac3d0a9287aa22190d7 19SHA1 (patch-hw_alpha_dp264.c) = 856304784f098863728ecac3d0a9287aa22190d7
20SHA1 (patch-hw_alpha_typhoon.c) = 1bed5cd6f355c4163585c5331356ebf38c5c3a16 20SHA1 (patch-hw_alpha_typhoon.c) = 1bed5cd6f355c4163585c5331356ebf38c5c3a16
21SHA1 (patch-hw_core_uboot__image.h) = 17eef02349343c5fcfb7a4069cb6f8fd11efcb59 21SHA1 (patch-hw_core_uboot__image.h) = 17eef02349343c5fcfb7a4069cb6f8fd11efcb59
22SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420 22SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
23SHA1 (patch-hw_mips_meson.build) = 4d1ed1ae2dbfb3edfe5fa5271c4561531b08efee 23SHA1 (patch-hw_mips_meson.build) = 4d1ed1ae2dbfb3edfe5fa5271c4561531b08efee
24SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc 24SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
25SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7 25SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
26SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310 26SHA1 (patch-hw_rtc_mc146818rtc.c) = cc7a3b28010966b65b7a16db756226ac2669f310
27SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33 27SHA1 (patch-hw_scsi_scsi-disk.c) = fdbf2f962a6dcb1a115a7f8a5b8790ff9295fb33
28SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43 28SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a41cc75810cfece1b8aef1831fab4ce43
29SHA1 (patch-include_sysemu_hw_accel.h) = d083cd51434e28eb0d647b5107d34018b0ef63dc 29SHA1 (patch-include_sysemu_hw_accel.h) = d083cd51434e28eb0d647b5107d34018b0ef63dc
30SHA1 (patch-include_sysemu_kvm.h) = 9847abe3be70bd708a521310f5d5515e45a1a5a0 30SHA1 (patch-include_sysemu_kvm.h) = 9847abe3be70bd708a521310f5d5515e45a1a5a0
31SHA1 (patch-include_sysemu_nvmm.h) = 1fe49c4f11910d6faf683ae3233f783a0b03ce5a 31SHA1 (patch-include_sysemu_nvmm.h) = 1fe49c4f11910d6faf683ae3233f783a0b03ce5a
32SHA1 (patch-meson.build) = a931d40f4d4fccfe506c5999017cdd1135717cfc 32SHA1 (patch-meson.build) = bb2539c4381effa5a4eb3c8d2a29a21f90af648e
33SHA1 (patch-meson__options.txt) = 286d097f596baa5af244a990d2874f1a7ee65198 33SHA1 (patch-meson__options.txt) = 286d097f596baa5af244a990d2874f1a7ee65198
34SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5 34SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5
35SHA1 (patch-qemu-options.hx) = e2f264117f703aa4ccf56219f370c3b1303e8b07 35SHA1 (patch-qemu-options.hx) = e2f264117f703aa4ccf56219f370c3b1303e8b07
36SHA1 (patch-roms_qemu-palcode_hwrpb.h) = ae7b4c0680367af6f740d62a54dc86352128d76f 36SHA1 (patch-roms_qemu-palcode_hwrpb.h) = ae7b4c0680367af6f740d62a54dc86352128d76f
37SHA1 (patch-roms_qemu-palcode_init.c) = 7a0ebcd86f4106318791e7d90273fb55a424f1b8 37SHA1 (patch-roms_qemu-palcode_init.c) = 7a0ebcd86f4106318791e7d90273fb55a424f1b8
38SHA1 (patch-roms_qemu-palcode_memcpy.c) = 7761774ae9092d0f494deaf302d663ba479a09cf 38SHA1 (patch-roms_qemu-palcode_memcpy.c) = 7761774ae9092d0f494deaf302d663ba479a09cf
39SHA1 (patch-roms_qemu-palcode_memset.c) = 55fa4e52e03a351eb98475e7c4755e5edc409e6c 39SHA1 (patch-roms_qemu-palcode_memset.c) = 55fa4e52e03a351eb98475e7c4755e5edc409e6c
40SHA1 (patch-roms_qemu-palcode_pal.S) = 4f41194ffaeaddb39fa7bff953bd75c2f070dfa5 40SHA1 (patch-roms_qemu-palcode_pal.S) = 4f41194ffaeaddb39fa7bff953bd75c2f070dfa5
41SHA1 (patch-roms_qemu-palcode_pci.c) = 1d5b240fd6c940cbbe8518e4db529adba23d6fec 41SHA1 (patch-roms_qemu-palcode_pci.c) = 1d5b240fd6c940cbbe8518e4db529adba23d6fec
42SHA1 (patch-roms_qemu-palcode_pci.h) = 081c9d6d9955be24fd19455ae653339cdb133f02 42SHA1 (patch-roms_qemu-palcode_pci.h) = 081c9d6d9955be24fd19455ae653339cdb133f02
43SHA1 (patch-roms_qemu-palcode_printf.c) = 7fb158f85bd1be9a939850d9d86175013f7a142b 43SHA1 (patch-roms_qemu-palcode_printf.c) = 7fb158f85bd1be9a939850d9d86175013f7a142b
44SHA1 (patch-roms_qemu-palcode_protos.h) = 60cf9db5544cb842207a893a78fa6bbe45af4c71 44SHA1 (patch-roms_qemu-palcode_protos.h) = 60cf9db5544cb842207a893a78fa6bbe45af4c71
45SHA1 (patch-roms_qemu-palcode_sys-clipper.h) = 8983d7072b1c1e66bf0a18d2e49e503745692a46 45SHA1 (patch-roms_qemu-palcode_sys-clipper.h) = 8983d7072b1c1e66bf0a18d2e49e503745692a46
cvs diff -r1.3 -r1.4 pkgsrc/emulators/qemu/patches/patch-meson.build (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/patches/patch-meson.build 2021/03/06 21:50:34 1.3
+++ pkgsrc/emulators/qemu/patches/patch-meson.build 2021/03/14 11:16:45 1.4
@@ -1,93 +1,95 @@ @@ -1,93 +1,95 @@
1$NetBSD: patch-meson.build,v 1.3 2021/03/06 21:50:34 leot Exp $ 1$NetBSD: patch-meson.build,v 1.4 2021/03/14 11:16:45 reinoud Exp $
2 2
3* Add NetBSD support. 3* Add NetBSD support.
4* Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv) 4* Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
5 to fix qemu-system-aarch64 link. 5 to fix qemu-system-aarch64 link.
6* Detect curses (non-ncurses{,w} too) 6* Detect curses (non-ncurses{,w} too)
7 7
8--- meson.build.orig 2020-12-08 16:59:44.000000000 +0000 8--- meson.build.orig 2020-12-08 16:59:44.000000000 +0000
9+++ meson.build 9+++ meson.build
10@@ -84,6 +84,7 @@ if cpu in ['x86', 'x86_64'] 10@@ -84,6 +84,7 @@ if cpu in ['x86', 'x86_64']
11 accelerator_targets += { 11 accelerator_targets += {
12 'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'], 12 'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'],
13 'CONFIG_HVF': ['x86_64-softmmu'], 13 'CONFIG_HVF': ['x86_64-softmmu'],
14+ 'CONFIG_NVMM': ['x86_64-softmmu'], 14+ 'CONFIG_NVMM': ['x86_64-softmmu'],
15 'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'], 15 'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'],
16 } 16 }
17 endif 17 endif
18@@ -169,6 +170,7 @@ version_res = [] 18@@ -169,6 +170,7 @@ version_res = []
19 coref = [] 19 coref = []
20 iokit = [] 20 iokit = []
21 emulator_link_args = [] 21 emulator_link_args = []
22+nvmm = [] 22+nvmm = []
23 cocoa = not_found 23 cocoa = not_found
24 hvf = not_found 24 hvf = not_found
25 if targetos == 'windows' 25 if targetos == 'windows'
26@@ -196,6 +198,10 @@ elif targetos == 'openbsd' 26@@ -196,6 +198,12 @@ elif targetos == 'openbsd'
27 # Disable OpenBSD W^X if available 27 # Disable OpenBSD W^X if available
28 emulator_link_args = cc.get_supported_link_arguments('-Wl,-z,wxneeded') 28 emulator_link_args = cc.get_supported_link_arguments('-Wl,-z,wxneeded')
29 endif 29 endif
30+elif targetos == 'netbsd' 30+elif targetos == 'netbsd'
31+ if not get_option('nvmm').disabled() 31+ if not get_option('nvmm').disabled()
32+ nvmm = cc.find_library('nvmm') 32+ if cc.has_header('nvmm.h')
 33+ nvmm = cc.find_library('nvmm')
 34+ endif
33+ endif 35+ endif
34 endif 36 endif
35  37
36 accelerators = [] 38 accelerators = []
37@@ -228,6 +234,11 @@ if not get_option('hax').disabled() 39@@ -228,6 +236,11 @@ if not get_option('hax').disabled()
38 accelerators += 'CONFIG_HAX' 40 accelerators += 'CONFIG_HAX'
39 endif 41 endif
40 endif 42 endif
41+if not get_option('nvmm').disabled() 43+if not get_option('nvmm').disabled()
42+ if cc.has_header('nvmm.h', required: get_option('nvmm')) 44+ if cc.has_header('nvmm.h', required: get_option('nvmm'))
43+ accelerators += 'CONFIG_NVMM' 45+ accelerators += 'CONFIG_NVMM'
44+ endif 46+ endif
45+endif 47+endif
46 if not get_option('tcg').disabled() 48 if not get_option('tcg').disabled()
47 if cpu not in supported_cpus 49 if cpu not in supported_cpus
48 if 'CONFIG_TCG_INTERPRETER' in config_host 50 if 'CONFIG_TCG_INTERPRETER' in config_host
49@@ -246,6 +257,9 @@ endif 51@@ -246,6 +259,9 @@ endif
50 if 'CONFIG_HVF' not in accelerators and get_option('hvf').enabled() 52 if 'CONFIG_HVF' not in accelerators and get_option('hvf').enabled()
51 error('HVF not available on this platform') 53 error('HVF not available on this platform')
52 endif 54 endif
53+if 'CONFIG_NVMM' not in accelerators and get_option('nvmm').enabled() 55+if 'CONFIG_NVMM' not in accelerators and get_option('nvmm').enabled()
54+ error('NVMM not available on this platform') 56+ error('NVMM not available on this platform')
55+endif 57+endif
56 if 'CONFIG_WHPX' not in accelerators and get_option('whpx').enabled() 58 if 'CONFIG_WHPX' not in accelerators and get_option('whpx').enabled()
57 error('WHPX not available on this platform') 59 error('WHPX not available on this platform')
58 endif 60 endif
59@@ -517,7 +531,7 @@ if have_system and not get_option('curse 61@@ -517,7 +533,7 @@ if have_system and not get_option('curse
60 has_curses_h = cc.has_header('curses.h', args: curses_compile_args) 62 has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
61 endif 63 endif
62 if has_curses_h 64 if has_curses_h
63- curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw']) 65- curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw'])
64+ curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw', 'curses']) 66+ curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw', 'curses'])
65 foreach curses_libname : curses_libname_list 67 foreach curses_libname : curses_libname_list
66 libcurses = cc.find_library(curses_libname, 68 libcurses = cc.find_library(curses_libname,
67 required: false, 69 required: false,
68@@ -535,7 +549,7 @@ if have_system and not get_option('curse 70@@ -535,7 +551,7 @@ if have_system and not get_option('curse
69 endif 71 endif
70 endif 72 endif
71 if not get_option('iconv').disabled() 73 if not get_option('iconv').disabled()
72- foreach link_args : [ ['-liconv'], [] ] 74- foreach link_args : [ ['-liconv'], [] ]
73+ foreach link_args : [ [], ['-liconv'] ] 75+ foreach link_args : [ [], ['-liconv'] ]
74 # Programs will be linked with glib and this will bring in libiconv on FreeBSD. 76 # Programs will be linked with glib and this will bring in libiconv on FreeBSD.
75 # We need to use libiconv if available because mixing libiconv's headers with 77 # We need to use libiconv if available because mixing libiconv's headers with
76 # the system libc does not work. 78 # the system libc does not work.
77@@ -1815,7 +1829,7 @@ foreach target : target_dirs 79@@ -1815,7 +1831,7 @@ foreach target : target_dirs
78 'name': 'qemu-system-' + target_name, 80 'name': 'qemu-system-' + target_name,
79 'gui': false, 81 'gui': false,
80 'sources': files('softmmu/main.c'), 82 'sources': files('softmmu/main.c'),
81- 'dependencies': [] 83- 'dependencies': []
82+ 'dependencies': [nvmm] 84+ 'dependencies': [nvmm]
83 }] 85 }]
84 if targetos == 'windows' and (sdl.found() or gtk.found()) 86 if targetos == 'windows' and (sdl.found() or gtk.found())
85 execs += [{ 87 execs += [{
86@@ -2106,6 +2120,7 @@ summary_info += {'Install blobs': ge 88@@ -2106,6 +2122,7 @@ summary_info += {'Install blobs': ge
87 summary_info += {'KVM support': config_all.has_key('CONFIG_KVM')} 89 summary_info += {'KVM support': config_all.has_key('CONFIG_KVM')}
88 summary_info += {'HAX support': config_all.has_key('CONFIG_HAX')} 90 summary_info += {'HAX support': config_all.has_key('CONFIG_HAX')}
89 summary_info += {'HVF support': config_all.has_key('CONFIG_HVF')} 91 summary_info += {'HVF support': config_all.has_key('CONFIG_HVF')}
90+summary_info += {'NVMM support': config_all.has_key('CONFIG_NVMM')} 92+summary_info += {'NVMM support': config_all.has_key('CONFIG_NVMM')}
91 summary_info += {'WHPX support': config_all.has_key('CONFIG_WHPX')} 93 summary_info += {'WHPX support': config_all.has_key('CONFIG_WHPX')}
92 summary_info += {'TCG support': config_all.has_key('CONFIG_TCG')} 94 summary_info += {'TCG support': config_all.has_key('CONFIG_TCG')}
93 if config_all.has_key('CONFIG_TCG') 95 if config_all.has_key('CONFIG_TCG')