diff options
| author | adam <adam@pkgsrc.org> | 2020-01-10 20:27:03 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2020-01-10 20:27:03 +0000 |
| commit | 2c41d28801f8a62dc0c049b4c5f1dea33834f0ba (patch) | |
| tree | 0919a14329c61cef33a1203baad659cf32138e4f /emulators | |
| parent | 6c3b434987bb62db6c32171d2a0d3dbcf3c064bf (diff) | |
| download | pkgsrc-2c41d28801f8a62dc0c049b4c5f1dea33834f0ba.tar.gz | |
qemu: fix build on macOS
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/qemu/Makefile | 7 | ||||
| -rw-r--r-- | emulators/qemu/PLIST | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index c4ecf19ebfb..91676d95698 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.223 2020/01/04 13:46:59 ryoon Exp $ +# $NetBSD: Makefile,v 1.224 2020/01/10 20:27:03 adam Exp $ DISTNAME= qemu-4.2.0 PKGREVISION= 1 @@ -132,7 +132,7 @@ 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 keymap nbd pr-helper virtfs-proxy-helper .for pvar in ${USER_EMUL} PLIST.${pvar}= yes .endfor @@ -158,6 +158,8 @@ post-install: # On Darwin, qemu uses Cocoa and CoreAudio .if ${OPSYS} != "Darwin" +PLIST.keymap= yes +.include "../../x11/libxkbcommon/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .endif .include "../../archivers/lzo/buildlink3.mk" @@ -171,7 +173,6 @@ post-install: .include "../../lang/python/versioned_dependencies.mk" .include "../../security/libgcrypt/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -.include "../../x11/libxkbcommon/buildlink3.mk" .include "../../x11/pixman/buildlink3.mk" .include "../../mk/curses.buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST index f741d395bd5..36acb12b5c7 100644 --- a/emulators/qemu/PLIST +++ b/emulators/qemu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.64 2020/01/04 13:46:59 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.65 2020/01/10 20:27:03 adam Exp $ bin/elf2dmp ${PLIST.ivshmem}bin/ivshmem-client ${PLIST.ivshmem}bin/ivshmem-server @@ -14,7 +14,7 @@ ${PLIST.hppa}bin/qemu-hppa ${PLIST.i386}bin/qemu-i386 bin/qemu-img bin/qemu-io -bin/qemu-keymap +${PLIST.keymap}bin/qemu-keymap ${PLIST.m68k}bin/qemu-m68k ${PLIST.microblaze}bin/qemu-microblaze ${PLIST.microblazeel}bin/qemu-microblazeel |