Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators/qemu qemu: Don't build bsd usermode unless <...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f34a5e50f2c
branches:  trunk
changeset: 434926:0f34a5e50f2c
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jun 28 13:39:52 2020 +0000

description:
qemu: Don't build bsd usermode unless <machine/trap.h> exists on NetBSD

(It doesn't on 9.0 aarch64, apparently)

diffstat:

 emulators/qemu/Makefile |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 7556ac6fb8d3 -r 0f34a5e50f2c emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Sun Jun 28 13:30:29 2020 +0000
+++ b/emulators/qemu/Makefile   Sun Jun 28 13:39:52 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.245 2020/05/28 14:44:19 nia Exp $
+# $NetBSD: Makefile,v 1.246 2020/06/28 13:39:52 nia Exp $
 
 DISTNAME=      qemu-5.0.0
 PKGREVISION=   5
@@ -103,8 +103,12 @@
 UE_ARCHS+=             x86_64 xtensa xtensaeb
 
 .if ${OPSYS} == "NetBSD"
+PLIST.nbd=                     yes
+.  if !exists(/usr/include/machine/trap.h)
+CONFIGURE_ARGS+=               --disable-bsd-user
+.  else
 USER_EMUL=                     i386 x86_64 sparc sparc64
-PLIST.nbd=                     yes
+.  endif
 .elif !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
 USER_EMUL=                     i386 x86_64 sparc sparc64
 PLIST.nbd=                     yes



Home | Main Index | Thread Index | Old Index