Thu Apr 8 13:02:08 2021 UTC ()
qemu: some linux usermode targets are no longer being built

reported in #pkgsrc


(nia)
diff -r1.270 -r1.271 pkgsrc/emulators/qemu/Makefile
cvs diff -r1.270 -r1.271 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2021/04/07 13:21:28 1.270
+++ pkgsrc/emulators/qemu/Makefile 2021/04/08 13:02:08 1.271
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.270 2021/04/07 13:21:28 wiz Exp $ 1# $NetBSD: Makefile,v 1.271 2021/04/08 13:02:08 nia Exp $
2 2
3DISTNAME= qemu-5.2.0 3DISTNAME= qemu-5.2.0
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= https://download.qemu.org/ 6MASTER_SITES= https://download.qemu.org/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu-project.org/ 10HOMEPAGE= http://www.qemu-project.org/
11COMMENT= CPU emulator using dynamic translation 11COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 13
14BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build 14BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
@@ -88,30 +88,29 @@ NOT_PAX_MPROTECT_SAFE+= bin/qemu-system- @@ -88,30 +88,29 @@ NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-
88NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensaeb 88NOT_PAX_MPROTECT_SAFE+= bin/qemu-system-xtensaeb
89 89
90PKG_SYSCONFSUBDIR= qemu 90PKG_SYSCONFSUBDIR= qemu
91 91
92INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu 92INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
93 93
94UE_ARCHS+= aarch64 aarch64_be 94UE_ARCHS+= aarch64 aarch64_be
95UE_ARCHS+= alpha arm armeb cris 95UE_ARCHS+= alpha arm armeb cris
96UE_ARCHS+= hppa 96UE_ARCHS+= hppa
97UE_ARCHS+= i386 97UE_ARCHS+= i386
98UE_ARCHS+= m68k microblaze microblazeel 98UE_ARCHS+= m68k microblaze microblazeel
99UE_ARCHS+= mips mips64 mips64el mipsel mipsn32 mipsn32el 99UE_ARCHS+= mips mips64 mips64el mipsel mipsn32 mipsn32el
100UE_ARCHS+= nios2 100UE_ARCHS+= nios2
101UE_ARCHS+= or1k ppc ppc64 ppc64le ppc64abi32 101UE_ARCHS+= or1k ppc ppc64 ppc64le
102UE_ARCHS+= riscv32 riscv64 102UE_ARCHS+= riscv32 riscv64
103UE_ARCHS+= s390x sh4 sh4eb sparc sparc32plus sparc64 103UE_ARCHS+= s390x sh4 sh4eb sparc sparc32plus sparc64
104UE_ARCHS+= tilegx 
105UE_ARCHS+= x86_64 xtensa xtensaeb 104UE_ARCHS+= x86_64 xtensa xtensaeb
106 105
107.if ${OPSYS} == "NetBSD" 106.if ${OPSYS} == "NetBSD"
108PLIST.nbd= yes 107PLIST.nbd= yes
109. if !exists(/usr/include/machine/trap.h) 108. if !exists(/usr/include/machine/trap.h)
110CONFIGURE_ARGS+= --disable-bsd-user 109CONFIGURE_ARGS+= --disable-bsd-user
111. else 110. else
112USER_EMUL= i386 x86_64 sparc sparc64 111USER_EMUL= i386 x86_64 sparc sparc64
113. endif 112. endif
114.elif !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" 113.elif !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly"
115USER_EMUL= i386 x86_64 sparc sparc64 114USER_EMUL= i386 x86_64 sparc sparc64
116PLIST.nbd= yes 115PLIST.nbd= yes
117.elif ${OPSYS} == "Darwin" 116.elif ${OPSYS} == "Darwin"