Received: by mail.netbsd.org (Postfix, from userid 605)
	id E0D3D84DAF; Sun, 28 Jun 2020 13:39:53 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id 6B2A184D96
	for <pkgsrc-changes@NetBSD.org>; Sun, 28 Jun 2020 13:39:53 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id qbUUQJmT3Kh8 for <pkgsrc-changes@netbsd.org>;
	Sun, 28 Jun 2020 13:39:53 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id C7CAA84D02
	for <pkgsrc-changes@NetBSD.org>; Sun, 28 Jun 2020 13:39:52 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id C1932FB28; Sun, 28 Jun 2020 13:39:52 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_159335159264620"
MIME-Version: 1.0
Date: Sun, 28 Jun 2020 13:39:52 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/emulators/qemu
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
X-Mailer: log_accum
Message-Id: <20200628133952.C1932FB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_159335159264620
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sun Jun 28 13:39:52 UTC 2020

Modified Files:
	pkgsrc/emulators/qemu: Makefile

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

(It doesn't on 9.0 aarch64, apparently)


To generate a diff of this commit:
cvs rdiff -u -r1.245 -r1.246 pkgsrc/emulators/qemu/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_159335159264620
Content-Disposition: inline
Content-Length: 853
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.245 pkgsrc/emulators/qemu/Makefile:1.246
--- pkgsrc/emulators/qemu/Makefile:1.245	Thu May 28 14:44:19 2020
+++ pkgsrc/emulators/qemu/Makefile	Sun Jun 28 13:39:52 2020
@@ -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+=		tilegx
 UE_ARCHS+=		x86_64 xtensa xtensaeb
 
 .if ${OPSYS} == "NetBSD"
-USER_EMUL=			i386 x86_64 sparc sparc64
 PLIST.nbd=			yes
+.  if !exists(/usr/include/machine/trap.h)
+CONFIGURE_ARGS+=		--disable-bsd-user
+.  else
+USER_EMUL=			i386 x86_64 sparc sparc64
+.  endif
 .elif !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
 USER_EMUL=			i386 x86_64 sparc sparc64
 PLIST.nbd=			yes


--_----------=_159335159264620--