git: 1c7b941ef353 - main - emulators/qemu-devel: fix build on powerpc64*

The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1c7b941ef353bc9b96e86c00a60e4327cb8af606

commit 1c7b941ef353bc9b96e86c00a60e4327cb8af606
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-08-29 05:36:26 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-08-29 13:19:48 +0000

    emulators/qemu-devel: fix build on powerpc64*
    
    This forward ports 0d01a77b1ff0377c47919c3982d161e7546d34f.
---
 emulators/qemu-devel/Makefile  | 6 +++++-
 emulators/qemu-devel/pkg-plist | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 654f5dfcdfff..39012384bcc6 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -130,8 +130,12 @@ MAKE_ARGS+=	ARCH=ppc
 USE_GCC=	yes
 .endif
 
-.if ${ARCH} == "powerpc64"
+.if ${ARCH:Mpowerpc64*}
+CONFIGURE_ARGS+=	--disable-bsd-user
 MAKE_ARGS+=	ARCH=ppc64
+PLIST_SUB+=	BSDUSER="@comment "
+.else
+PLIST_SUB+=	BSDUSER=""
 .endif
 
 .if ${ARCH} == "sparc64"
diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index 8a0e597b2ec1..2fdbbe61ff5a 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -1,7 +1,7 @@
 bin/elf2dmp
-bin/qemu-arm
+%%BSDUSER%%bin/qemu-arm
 bin/qemu-edid
-bin/qemu-i386
+%%BSDUSER%%bin/qemu-i386
 bin/qemu-img
 bin/qemu-io
 %%GTK3%%bin/qemu-keymap
@@ -35,10 +35,10 @@ bin/qemu-system-i386
 %%NO_X86_TARGETS%%bin/qemu-system-sparc
 %%NO_X86_TARGETS%%bin/qemu-system-sparc64
 %%NO_X86_TARGETS%%bin/qemu-system-tricore
-bin/qemu-system-x86_64
+%%BSDUSER%%bin/qemu-system-x86_64
 %%NO_X86_TARGETS%%bin/qemu-system-xtensa
 %%NO_X86_TARGETS%%bin/qemu-system-xtensaeb
-bin/qemu-x86_64
+%%BSDUSER%%bin/qemu-x86_64
 include/qemu-plugin.h
 man/man1/qemu.1.gz
 man/man1/qemu-img.1.gz