git: 4b8ac78ce3e2 - main - emulators/qemu{,70}: enable for aarch64

From: Kyle Evans <kevans_at_FreeBSD.org>
Date: Thu, 03 Nov 2022 04:21:07 UTC
The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4b8ac78ce3e2d09f4b773209864f1b40545562c8

commit 4b8ac78ce3e2d09f4b773209864f1b40545562c8
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2022-11-02 03:54:18 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2022-11-03 04:20:12 +0000

    emulators/qemu{,70}: enable for aarch64
    
    Piggy-back off of the work done for powerpc64 to enable aarch64.  ppc64
    was untested, though I did sanity check MAKE_ARGS with ARCH forced to
    both powerpc64 and powerpc64le.  Both result in ARCH=ppc64, as they did
    before.
    
    While we're here, enable ${MAKE_JOBS_NUMBER} support -- the meson build
    will carry any -j flag passed to gmake on to ninja, otherwise it will
    default to -j1.
    
    Approved by:    bofh (maintainer)
    Sponsored by:   NetApp, Inc.
    Sponsored by:   Klara, Inc.
    Differential Revision:  https://reviews.freebsd.org/D37234
---
 emulators/qemu/Makefile   | 8 ++++----
 emulators/qemu70/Makefile | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 6fbfa513147d..8365e5bc6bc0 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -11,7 +11,7 @@ WWW=		https://wiki.qemu.org/Main_Page
 LICENSE=	GPLv2
 
 .if ${FLAVOR:U} != tools
-ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
 # We need to check if it build with other ARCHS
 # For i386 we have unknown type name 'vm_page_t'
 .endif
@@ -207,9 +207,9 @@ MAKE_ARGS+=	ARCH=ppc
 USE_GCC=	yes
 .endif
 
-.if ${ARCH:Mpowerpc64*}
+.if ${ARCH:Mpowerpc64*} || ${ARCH:Maarch64}
 CONFIGURE_ARGS+=	--disable-bsd-user
-MAKE_ARGS+=	ARCH=ppc64
+MAKE_ARGS+=	ARCH=${ARCH:C/powerpc64.*/ppc64/}
 PLIST_SUB+=	BSDUSER="@comment "
 .else
 PLIST_SUB+=	BSDUSER=""
@@ -226,7 +226,7 @@ post-patch-CDROM_DMA-off:
 	@${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h
 
 do-build:
-	cd ${WRKSRC} && ${GMAKE}
+	cd ${WRKSRC} && ${GMAKE} -j${MAKE_JOBS_NUMBER}
 
 do-install:
 	cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install
diff --git a/emulators/qemu70/Makefile b/emulators/qemu70/Makefile
index 7dd97baa3cae..c6c8e0181c61 100644
--- a/emulators/qemu70/Makefile
+++ b/emulators/qemu70/Makefile
@@ -11,7 +11,7 @@ WWW=		https://wiki.qemu.org/Main_Page
 LICENSE=	GPLv2
 
 .if ${FLAVOR:U} != tools
-ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
 # We need to check if it build with other ARCHS
 # For i386 we have unknown type name 'vm_page_t'
 .endif
@@ -207,9 +207,9 @@ MAKE_ARGS+=	ARCH=ppc
 USE_GCC=	yes
 .endif
 
-.if ${ARCH:Mpowerpc64*}
+.if ${ARCH:Mpowerpc64*} || ${ARCH:Maarch64}
 CONFIGURE_ARGS+=	--disable-bsd-user
-MAKE_ARGS+=	ARCH=ppc64
+MAKE_ARGS+=	ARCH=${ARCH:C/powerpc64.*/ppc64/}
 PLIST_SUB+=	BSDUSER="@comment "
 .else
 PLIST_SUB+=	BSDUSER=""
@@ -226,7 +226,7 @@ post-patch-CDROM_DMA-off:
 	@${REINPLACE_CMD} -e '/USE_DMA_CDROM/d' ${WRKSRC}/include/hw/ide/internal.h
 
 do-build:
-	cd ${WRKSRC} && ${GMAKE}
+	cd ${WRKSRC} && ${GMAKE} -j${MAKE_JOBS_NUMBER}
 
 do-install:
 	cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install