Re: pkg/54772: emulators/qemu: failed install on Linux/Debian (PLIST mismatch)

["David H. Gutteridge" <david%gutteridge.ca@localhost>]

The following reply was made to PR pkg/54772; it has been noted by GNATS.

From: "David H. Gutteridge" <david%gutteridge.ca@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/54772: emulators/qemu: failed install on Linux/Debian
 (PLIST mismatch)
Date: Tue, 07 Jan 2020 13:02:22 -0500

 I've tested the following patches on Fedora 31 where the libcap and
 libattr header libraries are absent and present (in the latter case
 with the new option enabled), and both builds worked as expected.
 There are a couple of things to note. A conditional adding to
 PKG_SUPPORTED_OPTIONS isn't a common construct as far as I've noticed,
 but I see there's precedent in sysutils/dbus, and it makes the most
 sense. I didn't bother conditionalizing PLIST_VARS, as it wasn't
 necessary, but I moved virtfs-proxy-helper to options.mk so all
 references to it are found in one place. I can commit this if everybody
 likes.
 
 Index: options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/emulators/qemu/options.mk,v
 retrieving revision 1.5
 diff -u -r1.5 options.mk
 --- options.mk  14 Aug 2018 06:57:26 -0000      1.5
 +++ options.mk  7 Jan 2020 03:32:51 -0000
 @@ -5,13 +5,17 @@
  
  .include "../../mk/bsd.fast.prefs.mk"
  
 +.if ${OPSYS} == "Linux"
 +PKG_SUPPORTED_OPTIONS+=        virtfs-proxy-helper
 +.endif
 +
  .if ${OPSYS} != "Darwin"
  PKG_SUGGESTED_OPTIONS+=        sdl
  .endif
  
  .include "../../mk/bsd.options.mk"
  
 -PLIST_VARS+=           gtk
 +PLIST_VARS+=           gtk virtfs-proxy-helper
  
  .if !empty(PKG_OPTIONS:Mgtk3)
  PLIST.gtk=             yes
 @@ -27,3 +31,12 @@
  .else
  CONFIGURE_ARGS+=       --disable-sdl
  .endif
 +
 +# NB to successfully build virtfs-proxy-helper, the upstream Linux
 +# header/development libraries libcap and libattr must be installed.
 +.if !empty(PKG_OPTIONS:Mvirtfs-proxy-helper)
 +PLIST.virtfs-proxy-helper=     yes
 +CONFIGURE_ARGS+=               --enable-virtfs
 +.else
 +CONFIGURE_ARGS+=               --disable-virtfs
 +.endif
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/emulators/qemu/Makefile,v
 retrieving revision 1.223
 diff -u -r1.223 Makefile
 --- Makefile    4 Jan 2020 13:46:59 -0000       1.223
 +++ Makefile    7 Jan 2020 03:33:23 -0000
 @@ -125,14 +125,13 @@
  PLIST.nbd=                     yes
  PLIST.ivshmem=                 yes
  PLIST.pr-helper=               yes
 -PLIST.virtfs-proxy-helper=     yes
  .elif !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
  PLIST.ivshmem=                 yes
  PLIST.nbd=                     yes
  CONFIGURE_ARGS+=               --disable-coroutine-pool
  .endif
  
 -PLIST_VARS+=           ${UE_ARCHS} bridge-helper ivshmem nbd pr-helper virtfs-proxy-helper
 +PLIST_VARS+=           ${UE_ARCHS} bridge-helper ivshmem nbd pr-helper
  .for pvar in ${USER_EMUL}
  PLIST.${pvar}=         yes
  .endfor