diff options
| author | roy <roy@pkgsrc.org> | 2021-01-03 21:42:29 +0000 |
|---|---|---|
| committer | roy <roy@pkgsrc.org> | 2021-01-03 21:42:29 +0000 |
| commit | 80cd25a267caf97a8dec37d316bd578960e8decd (patch) | |
| tree | f2c1394e5bbe1e244da0bb6942f8ef0d7ca9a983 /emulators/qemu | |
| parent | be0cb94a38274e7d312927fecf611dd30fc8ec69 (diff) | |
| download | pkgsrc-80cd25a267caf97a8dec37d316bd578960e8decd.tar.gz | |
qemu: x11 isn't an option
If not Darwin, depend on libxkbcommon if any of these options are set:
* gtk3
* opengl
* sdl
Diffstat (limited to 'emulators/qemu')
| -rw-r--r-- | emulators/qemu/Makefile | 10 | ||||
| -rw-r--r-- | emulators/qemu/options.mk | 13 |
2 files changed, 14 insertions, 9 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 6e8366ad38f..6d4c1627de4 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.259 2020/12/20 16:51:44 spz Exp $ +# $NetBSD: Makefile,v 1.260 2021/01/03 21:42:29 roy Exp $ DISTNAME= qemu-5.1.0 PKGREVISION= 11 @@ -159,14 +159,8 @@ post-install: cd ${DESTDIR}${PREFIX} && \ ${FIND} share/doc/qemu -path '*/_static/*' -type f -print > ${WRKDIR}/PLIST.STATIC -# On Darwin, qemu uses Cocoa and CoreAudio +# On Darwin, qemu uses CoreAudio .if ${OPSYS} != "Darwin" -.if !empty(PKG_OPTIONS:Mx11) -PLIST.keymap= yes -.include "../../x11/libxkbcommon/buildlink3.mk" -.else -CONFIGURE_ARGS+= --disable-xkbcommon -.endif .include "../../mk/oss.buildlink3.mk" .endif .include "../../archivers/lzo/buildlink3.mk" diff --git a/emulators/qemu/options.mk b/emulators/qemu/options.mk index 1c0185915a2..bdb0165a5fb 100644 --- a/emulators/qemu/options.mk +++ b/emulators/qemu/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.13 2020/12/15 16:50:08 maya Exp $ +# $NetBSD: options.mk,v 1.14 2021/01/03 21:42:29 roy Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qemu PKG_SUPPORTED_OPTIONS= debug-info gtk3 iscsi sdl spice @@ -55,6 +55,17 @@ CONFIGURE_ARGS+= --enable-sdl CONFIGURE_ARGS+= --disable-sdl .endif +# On Darwin, qemu uses Coca +.if ${OPSYS} != "Darwin" +.if !empty(PKG_OPTIONS:Mgtk3) || \ + !empty(PKG_OPTIONS:Mopengl) || !empty(PKG_OPTIONS:Msdl) +PLIST.keymap= yes +.include "../../x11/libxkbcommon/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-xkbcommon +.endif +.endif + # NB to successfully build virtfs-proxy-helper, the upstream Linux # header/development libraries for libcap and libattr must be installed. .if !empty(PKG_OPTIONS:Mvirtfs-proxy-helper) |