From: Brad Smith <brad@comstyle.com>
Subject: Re: UPDATE: QEMU 10.0.2
To: Stuart Henderson <stu@spacehopper.org>
Cc: ports@openbsd.org
Date: Thu, 24 Jul 2025 14:52:42 -0400

On Thu, Jul 24, 2025 at 11:06:43AM +0100, Stuart Henderson wrote:
> On 2025/07/09 14:53, Brad Smith wrote:
> > Here is an update to QEMU 10.0.2.
> 
> packaging broke on i386, errors/configure output inline, full log attached

With 10.0 and newer 64-bit hosts running on 32-bit hosts is no longer supported.

Not sure if I want to go this route or just have the port only build
on 64-bit hosts.


Index: Makefile
===================================================================
RCS file: /cvs/ports/emulators/qemu/Makefile,v
retrieving revision 1.255
diff -u -p -u -p -r1.255 Makefile
--- Makefile	20 Jul 2025 14:53:32 -0000	1.255
+++ Makefile	24 Jul 2025 17:11:09 -0000
@@ -8,6 +8,7 @@ COMMENT-ga=	QEMU guest agent
 
 VERSION=	10.0.2
 DISTNAME=	qemu-${VERSION}
+REVISION=	0
 CATEGORIES=	emulators
 SITES=		https://download.qemu.org/
 EXTRACT_SUFX=	.tar.xz
@@ -111,6 +112,14 @@ CONFIGURE_ARGS+=--enable-debug
 INSTALL_STRIP=
 .else
 CONFIGURE_ARGS+=--disable-debug-info
+.endif
+
+.include <bsd.port.arch.mk>
+
+.if ${PROPERTIES:Mlp64}
+PKG_ARGS+=	-Dlp64=1
+.else
+PKG_ARGS+=	-Dlp64=0
 .endif
 
 TEST_TARGET=	check
Index: pkg/PFRAG.lp64-main
===================================================================
RCS file: pkg/PFRAG.lp64-main
diff -N pkg/PFRAG.lp64-main
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.lp64-main	24 Jul 2025 17:11:09 -0000
@@ -0,0 +1,13 @@
+@bin bin/qemu-system-aarch64
+@bin bin/qemu-system-alpha
+@bin bin/qemu-system-hppa
+@bin bin/qemu-system-loongarch64
+@bin bin/qemu-system-microblaze
+@bin bin/qemu-system-microblazeel
+@bin bin/qemu-system-mips64
+@bin bin/qemu-system-mips64el
+@bin bin/qemu-system-ppc64
+@bin bin/qemu-system-riscv64
+@bin bin/qemu-system-s390x
+@bin bin/qemu-system-sparc64
+@bin bin/qemu-system-x86_64
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/emulators/qemu/pkg/PLIST-main,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 PLIST-main
--- pkg/PLIST-main	20 Jul 2025 14:53:32 -0000	1.24
+++ pkg/PLIST-main	24 Jul 2025 17:11:09 -0000
@@ -6,35 +6,23 @@
 @bin bin/qemu-keymap
 @bin bin/qemu-nbd
 @bin bin/qemu-storage-daemon
-@bin bin/qemu-system-aarch64
-@bin bin/qemu-system-alpha
 @bin bin/qemu-system-arm
 @bin bin/qemu-system-avr
-@bin bin/qemu-system-hppa
 @bin bin/qemu-system-i386
-@bin bin/qemu-system-loongarch64
 @bin bin/qemu-system-m68k
-@bin bin/qemu-system-microblaze
-@bin bin/qemu-system-microblazeel
 @bin bin/qemu-system-mips
-@bin bin/qemu-system-mips64
-@bin bin/qemu-system-mips64el
 @bin bin/qemu-system-mipsel
 @bin bin/qemu-system-or1k
 @bin bin/qemu-system-ppc
-@bin bin/qemu-system-ppc64
 @bin bin/qemu-system-riscv32
-@bin bin/qemu-system-riscv64
 @bin bin/qemu-system-rx
-@bin bin/qemu-system-s390x
 @bin bin/qemu-system-sh4
 @bin bin/qemu-system-sh4eb
 @bin bin/qemu-system-sparc
-@bin bin/qemu-system-sparc64
 @bin bin/qemu-system-tricore
-@bin bin/qemu-system-x86_64
 @bin bin/qemu-system-xtensa
 @bin bin/qemu-system-xtensaeb
+%%lp64%%
 @man man/man1/qemu-img.1
 @man man/man1/qemu-storage-daemon.1
 @man man/man1/qemu.1