CVS commit: pkgsrc/emulators/qemu

["Reinoud Zandijk" <reinoud%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   reinoud
Date:           Sun Mar 14 11:16:45 UTC 2021

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.266 -r1.267 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.173 -r1.174 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.3 -r1.4 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/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.266 pkgsrc/emulators/qemu/Makefile:1.267
--- pkgsrc/emulators/qemu/Makefile:1.266        Sat Mar  6 21:50:34 2021
+++ pkgsrc/emulators/qemu/Makefile      Sun Mar 14 11:16:45 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.266 2021/03/06 21:50:34 leot Exp $
+# $NetBSD: Makefile,v 1.267 2021/03/14 11:16:45 reinoud Exp $
 
 DISTNAME=      qemu-5.2.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz
@@ -16,6 +16,7 @@ BUILD_DEPENDS+=       ninja-build-[0-9]*:../..
 USE_CURSES=            resize_term wide
 USE_LANGUAGES+=                c c++
 USE_TOOLS+=            bison flex gmake makeinfo perl:build pod2man pkg-config
+FAKE_NCURSES=          yes
 UNLIMIT_RESOURCES=     datasize
 HAS_CONFIGURE=         yes
 
@@ -173,6 +174,7 @@ post-install:
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/jemalloc/buildlink3.mk"
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../devel/snappy/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
@@ -182,7 +184,6 @@ post-install:
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.173 pkgsrc/emulators/qemu/distinfo:1.174
--- pkgsrc/emulators/qemu/distinfo:1.173        Sat Mar  6 21:50:34 2021
+++ pkgsrc/emulators/qemu/distinfo      Sun Mar 14 11:16:45 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.173 2021/03/06 21:50:34 leot Exp $
+$NetBSD: distinfo,v 1.174 2021/03/14 11:16:45 reinoud Exp $
 
 SHA1 (palcode-clipper) = e25ae10a10e0801e47b62b9ee2d10c8ccb4ee940
 RMD160 (palcode-clipper) = a637f1cc38dabfdff36e3f02b6dd02d7c63cb8db
@@ -29,7 +29,7 @@ SHA1 (patch-hw_usb_dev-mtp.c) = 94ddf53a
 SHA1 (patch-include_sysemu_hw_accel.h) = d083cd51434e28eb0d647b5107d34018b0ef63dc
 SHA1 (patch-include_sysemu_kvm.h) = 9847abe3be70bd708a521310f5d5515e45a1a5a0
 SHA1 (patch-include_sysemu_nvmm.h) = 1fe49c4f11910d6faf683ae3233f783a0b03ce5a
-SHA1 (patch-meson.build) = a931d40f4d4fccfe506c5999017cdd1135717cfc
+SHA1 (patch-meson.build) = bb2539c4381effa5a4eb3c8d2a29a21f90af648e
 SHA1 (patch-meson__options.txt) = 286d097f596baa5af244a990d2874f1a7ee65198
 SHA1 (patch-net_tap-solaris.c) = cc953c9a624dd55ace4e130d0b31bbfb956c17d5
 SHA1 (patch-qemu-options.hx) = e2f264117f703aa4ccf56219f370c3b1303e8b07

Index: pkgsrc/emulators/qemu/patches/patch-meson.build
diff -u pkgsrc/emulators/qemu/patches/patch-meson.build:1.3 pkgsrc/emulators/qemu/patches/patch-meson.build:1.4
--- pkgsrc/emulators/qemu/patches/patch-meson.build:1.3 Sat Mar  6 21:50:34 2021
+++ pkgsrc/emulators/qemu/patches/patch-meson.build     Sun Mar 14 11:16:45 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.3 2021/03/06 21:50:34 leot Exp $
+$NetBSD: patch-meson.build,v 1.4 2021/03/14 11:16:45 reinoud Exp $
 
 * Add NetBSD support.
 * Detect iconv in libc properly for pkgsrc (pkgsrc removes -liconv)
@@ -23,18 +23,20 @@ $NetBSD: patch-meson.build,v 1.3 2021/03
  cocoa = not_found
  hvf = not_found
  if targetos == 'windows'
-@@ -196,6 +198,10 @@ elif targetos == 'openbsd'
+@@ -196,6 +198,12 @@ elif targetos == 'openbsd'
      # Disable OpenBSD W^X if available
      emulator_link_args = cc.get_supported_link_arguments('-Wl,-z,wxneeded')
    endif
 +elif targetos == 'netbsd'
 +  if not get_option('nvmm').disabled()
-+    nvmm = cc.find_library('nvmm')
++    if cc.has_header('nvmm.h')
++      nvmm = cc.find_library('nvmm')
++    endif
 +  endif
  endif
  
  accelerators = []
-@@ -228,6 +234,11 @@ if not get_option('hax').disabled()
+@@ -228,6 +236,11 @@ if not get_option('hax').disabled()
      accelerators += 'CONFIG_HAX'
    endif
  endif
@@ -46,7 +48,7 @@ $NetBSD: patch-meson.build,v 1.3 2021/03
  if not get_option('tcg').disabled()
    if cpu not in supported_cpus
      if 'CONFIG_TCG_INTERPRETER' in config_host
-@@ -246,6 +257,9 @@ endif
+@@ -246,6 +259,9 @@ endif
  if 'CONFIG_HVF' not in accelerators and get_option('hvf').enabled()
    error('HVF not available on this platform')
  endif
@@ -56,7 +58,7 @@ $NetBSD: patch-meson.build,v 1.3 2021/03
  if 'CONFIG_WHPX' not in accelerators and get_option('whpx').enabled()
    error('WHPX not available on this platform')
  endif
-@@ -517,7 +531,7 @@ if have_system and not get_option('curse
+@@ -517,7 +533,7 @@ if have_system and not get_option('curse
        has_curses_h = cc.has_header('curses.h', args: curses_compile_args)
      endif
      if has_curses_h
@@ -65,7 +67,7 @@ $NetBSD: patch-meson.build,v 1.3 2021/03
        foreach curses_libname : curses_libname_list
          libcurses = cc.find_library(curses_libname,
                                      required: false,
-@@ -535,7 +549,7 @@ if have_system and not get_option('curse
+@@ -535,7 +551,7 @@ if have_system and not get_option('curse
      endif
    endif
    if not get_option('iconv').disabled()
@@ -74,7 +76,7 @@ $NetBSD: patch-meson.build,v 1.3 2021/03
        # 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.
-@@ -1815,7 +1829,7 @@ foreach target : target_dirs
+@@ -1815,7 +1831,7 @@ foreach target : target_dirs
        'name': 'qemu-system-' + target_name,
        'gui': false,
        'sources': files('softmmu/main.c'),
@@ -83,7 +85,7 @@ $NetBSD: patch-meson.build,v 1.3 2021/03
      }]
      if targetos == 'windows' and (sdl.found() or gtk.found())
        execs += [{
-@@ -2106,6 +2120,7 @@ summary_info += {'Install blobs':     ge
+@@ -2106,6 +2122,7 @@ summary_info += {'Install blobs':     ge
  summary_info += {'KVM support':       config_all.has_key('CONFIG_KVM')}
  summary_info += {'HAX support':       config_all.has_key('CONFIG_HAX')}
  summary_info += {'HVF support':       config_all.has_key('CONFIG_HVF')}