CVS commit: pkgsrc/emulators/qemu

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Thu Aug 14 19:25:59 UTC 2025

Modified Files:
        pkgsrc/emulators/qemu: Makefile PLIST

Log Message:
qemu: fix build on NetBSD/i386 10.1 (and maybe other IPL32 hosts).

Fixes PR/59592, Ok'ed by wiz@.


To generate a diff of this commit:
cvs rdiff -u -r1.382 -r1.383 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.98 -r1.99 pkgsrc/emulators/qemu/PLIST

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

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.382 pkgsrc/emulators/qemu/Makefile:1.383
--- pkgsrc/emulators/qemu/Makefile:1.382        Fri Aug  8 20:48:48 2025
+++ pkgsrc/emulators/qemu/Makefile      Thu Aug 14 19:25:58 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.382 2025/08/08 20:48:48 wiz Exp $
+# $NetBSD: Makefile,v 1.383 2025/08/14 19:25:58 tsutsui Exp $
 
 .include "../../emulators/qemu/version.mk"
 
@@ -65,33 +65,41 @@ SSP_SUPPORTED=              no
 CONFIGURE_ARGS+=       --enable-stack-protector
 .endif
 
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-aarch64
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-alpha
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-arm
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-hppa
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-i386
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-m68k
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-microblaze
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-microblazeel
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mips
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mips64
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mips64el
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mipsel
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-or1k
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-ppc
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-ppc64
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-riscv32
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-riscv64
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-s390x
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-sh4
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-sh4eb
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-sparc
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-sparc64
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-tricore
-NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-x86_64
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-xtensa
 NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-xtensaeb
 
+PLIST_VARS+=           lp64
+.for platform in ${LP64PLATFORMS}
+.  if ${MACHINE_PLATFORM:M${platform}}
+PLIST.lp64=            yes
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-aarch64
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-alpha
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-hppa
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-loongarch64
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-microblaze
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-microblazeel
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mips64
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-mips64el
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-ppc64
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-riscv64
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-s390x
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-sparc64
+NOT_PAX_MPROTECT_SAFE+=        bin/qemu-system-x86_64
+.  endif
+.endfor
+
 PKG_SYSCONFSUBDIR=     qemu
 
 INSTALLATION_DIRS=     ${PKGMANDIR}/man1 share/doc/qemu

Index: pkgsrc/emulators/qemu/PLIST
diff -u pkgsrc/emulators/qemu/PLIST:1.98 pkgsrc/emulators/qemu/PLIST:1.99
--- pkgsrc/emulators/qemu/PLIST:1.98    Wed Jul  2 02:49:40 2025
+++ pkgsrc/emulators/qemu/PLIST Thu Aug 14 19:25:59 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.98 2025/07/02 02:49:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.99 2025/08/14 19:25:59 tsutsui Exp $
 bin/elf2dmp
 ${PLIST.aarch64}bin/qemu-aarch64
 ${PLIST.aarch64_be}bin/qemu-aarch64_be
@@ -38,33 +38,33 @@ ${PLIST.sparc}bin/qemu-sparc
 ${PLIST.sparc32plus}bin/qemu-sparc32plus
 ${PLIST.sparc64}bin/qemu-sparc64
 bin/qemu-storage-daemon
-bin/qemu-system-aarch64
-bin/qemu-system-alpha
+${PLIST.lp64}bin/qemu-system-aarch64
+${PLIST.lp64}bin/qemu-system-alpha
 bin/qemu-system-arm
 bin/qemu-system-avr
-bin/qemu-system-hppa
+${PLIST.lp64}bin/qemu-system-hppa
 bin/qemu-system-i386
-bin/qemu-system-loongarch64
+${PLIST.lp64}bin/qemu-system-loongarch64
 bin/qemu-system-m68k
-bin/qemu-system-microblaze
-bin/qemu-system-microblazeel
+${PLIST.lp64}bin/qemu-system-microblaze
+${PLIST.lp64}bin/qemu-system-microblazeel
 bin/qemu-system-mips
-bin/qemu-system-mips64
-bin/qemu-system-mips64el
+${PLIST.lp64}bin/qemu-system-mips64
+${PLIST.lp64}bin/qemu-system-mips64el
 bin/qemu-system-mipsel
 bin/qemu-system-or1k
 bin/qemu-system-ppc
-bin/qemu-system-ppc64
+${PLIST.lp64}bin/qemu-system-ppc64
 bin/qemu-system-riscv32
-bin/qemu-system-riscv64
+${PLIST.lp64}bin/qemu-system-riscv64
 bin/qemu-system-rx
-bin/qemu-system-s390x
+${PLIST.lp64}bin/qemu-system-s390x
 bin/qemu-system-sh4
 bin/qemu-system-sh4eb
 bin/qemu-system-sparc
-bin/qemu-system-sparc64
+${PLIST.lp64}bin/qemu-system-sparc64
 bin/qemu-system-tricore
-bin/qemu-system-x86_64
+${PLIST.lp64}bin/qemu-system-x86_64
 bin/qemu-system-xtensa
 bin/qemu-system-xtensaeb
 ${PLIST.vmsr-helper}bin/qemu-vmsr-helper