Wed May 21 12:19:12 2014 UTC ()
Convert qemu-0 and qemu options to an optional group.

No functional change intended; this merely uses
PKG_OPTIONS_OPTIONAL_GROUPS to choose qemu-0 vs qemu.
(Pointed out by wiz@.)


(gdt)
diff -r1.4 -r1.5 pkgsrc/misc/py-anita/options.mk
cvs diff -r1.4 -r1.5 pkgsrc/misc/py-anita/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/py-anita/options.mk 2014/05/20 18:06:07 1.4
+++ pkgsrc/misc/py-anita/options.mk 2014/05/21 12:19:12 1.5
@@ -1,38 +1,36 @@ @@ -1,38 +1,36 @@
1# $NetBSD: options.mk,v 1.4 2014/05/20 18:06:07 gdt Exp $ 1# $NetBSD: options.mk,v 1.5 2014/05/21 12:19:12 gdt Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.py-anita 3PKG_OPTIONS_VAR= PKG_OPTIONS.py-anita
4PKG_SUPPORTED_OPTIONS= qemu-0 qemu xen 4PKG_SUPPORTED_OPTIONS= xen
 5# In the future, qemu0 and qemu might install with different names,
 6# allowing anita to choose them dynamically. For now, they conflict,
 7# so don't permit both.
 8PKG_OPTIONS_OPTIONAL_GROUPS= qemu
 9PKG_OPTIONS_GROUP.qemu= qemu-0 qemu
5PKG_SUGGESTED_OPTIONS= 10PKG_SUGGESTED_OPTIONS=
6 11
7# To run (but not to build), anita needs some way to run a virtual 12# To run (but not to build), anita needs some way to run a virtual
8# machine. The standard approach is qemu-0, because it is known to 13# machine. The standard approach is qemu-0, because it is known to
9# work. Newer qemu is problematic. xen also works, but is less well 14# work. Newer qemu is problematic. xen also works, but is less well
10# tested. See anita(1) for details of the above. 15# tested. See anita(1) for details of the above.
11 16
12# By default, py-anita does not depend on any of these, because a 17# By default, py-anita does not depend on any of these, because a
13# hypervisor one doesn't want to use is a large burden (qemu in 18# hypervisor one doesn't want to use is a large burden (qemu in
14# particular is very large). While these options can be enabled, they 19# particular is very large). While these options can be enabled, they
15# also serve to document ways to fulfill the hypervisor requirement. 20# also serve to document ways to fulfill the hypervisor requirement.
16 21
17.include "../../mk/bsd.options.mk" 22.include "../../mk/bsd.options.mk"
18 23
19# In the future, qemu0 and qemu might install with different names, 
20# allowing anita to choose them dynamically. For now, they conflict, 
21# so don't try to build both. 
22.if !empty(PKG_OPTIONS:Mqemu-0) && !empty(PKG_OPTIONS:Mqemu) 
23.error py-anita: qemu-0 and qemu (currently) conflict 
24.endif 
25 
26.if !empty(PKG_OPTIONS:Mqemu-0) 24.if !empty(PKG_OPTIONS:Mqemu-0)
27DEPENDS+= qemu>=0.12.3nb2:../../emulators/qemu0 25DEPENDS+= qemu>=0.12.3nb2:../../emulators/qemu0
28.endif 26.endif
29 27
30.if !empty(PKG_OPTIONS:Mqemu) 28.if !empty(PKG_OPTIONS:Mqemu)
31# qemu1/2 does not work reliably. See the anita(1) man page. 29# qemu1/2 does not work reliably. See the anita(1) man page.
32DEPENDS+= qemu>=1.0:../../emulators/qemu 30DEPENDS+= qemu>=1.0:../../emulators/qemu
33.endif 31.endif
34 32
35.if !empty(PKG_OPTIONS:Mxen) 33.if !empty(PKG_OPTIONS:Mxen)
36# Choose 4.1 because that has been tested (with --vmm xm) and is 34# Choose 4.1 because that has been tested (with --vmm xm) and is
37# arguably a reasonable version to recommend to people wanting to 35# arguably a reasonable version to recommend to people wanting to
38# install xen to run anita. (A good case can be made for 4.2, and 36# install xen to run anita. (A good case can be made for 4.2, and