From nobody Thu Nov 03 04:21:07 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N2rD426B7z4grBJ; Thu, 3 Nov 2022 04:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N2rD41HfFz3mL3; Thu, 3 Nov 2022 04:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667449268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gi7+XQ3Bn1qLXOyjNzjE8tNOGWaEy5nEVsEGBY/XCro=; b=u0EPi4zxIvNscz4tslCMCLvJyFZjqwkC7lLx/D6dPeyn7XA8nm55FAic/LfYJEQ97fmIDQ ty9p0XRGThqveENn0l4mJl85AR1UM87q+5fN16F43HG8ppGNUj52XBMAkxOMu8HbnedWl5 CHaRzhO4tkIAKltt3YjjTNkM3bgMuxM6sOeziG2qng+7ZFAd1cWRxHg2RmzBLarsKeJiNp 79nPBtTfT1GU02BrG6/tRPipdKdKXuL6Fd7k/eTcABpXTYsLH8r52BSKiLzU2YMrAzVYmO Lh7S3sb0FQU4HnlL2YxA/Wn3c/yjPuCILS3MPCelHuybDnvXyJb++16lSwFW9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N2rD40K3GzN03; Thu, 3 Nov 2022 04:21:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A34L7Kx022334; Thu, 3 Nov 2022 04:21:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A34L7w6022333; Thu, 3 Nov 2022 04:21:07 GMT (envelope-from git) Date: Thu, 3 Nov 2022 04:21:07 GMT Message-Id: <202211030421.2A34L7w6022333@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kyle Evans Subject: git: 4b8ac78ce3e2 - main - emulators/qemu{,70}: enable for aarch64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b8ac78ce3e2d09f4b773209864f1b40545562c8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667449268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gi7+XQ3Bn1qLXOyjNzjE8tNOGWaEy5nEVsEGBY/XCro=; b=pP5tJQXN/fpg52pVZwRIgloxmo7XFC/OU7tgSMk0FFs3fdEpY57Ii6tfpjXAvtaLx++cKn h2e+6bEgzgKOBsLv+mPck60XtDRpiVXbsCVUTBvrqvtVl4NAtIHLcogYu7umgodFXirzJR IJGsXVa//7b7l0/PH06Ksw9HG1ZijtIZ45qDD0BBIojxXaQa8Vcywuype7k0Q8fPV+awV5 H1WgFh6w/ZnUDhueIH9YqG0y1jasWO0iE9fog6qvKqht8kUpcg/RggOzY1xZ9JqAXLE/NR mFtdzTWvVN0r+hXYWOgGM/SKknB1EwjBLMH7+1RsztfyCHYJC3/b3zM4q8ohkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667449268; a=rsa-sha256; cv=none; b=sFlHPmGk2ziglE+ZvBbZqqK/IW5PpEJeIxsf2C4LIIFXSYy3i4Iswt4bb0xCgMFL2IMExG Z5rdIJVnZ0YU3/wHOLVLAnH+pem/ClT2d4swkZ8sT+vTRs97EpcZKmzoJ1fWLdEerN9XxG enekFBL/PNanuLCNok9ZedSghfFmNLCgHjRhOA5o1i3EToLxjMJti+Cck84lhOEheurgIo n25NTOCtjBknloYNGv+Zo07f/sYStg68HvNnd3QxV5ystHzxz7aB3XCgj/jnmq+yfPEDuT Qp5Mywle767+2A4uNkdc4XWqD+s7C8QWgbUClQR6meWSFkPRVNOJz3VunlVSlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b8ac78ce3e2d09f4b773209864f1b40545562c8 commit 4b8ac78ce3e2d09f4b773209864f1b40545562c8 Author: Kyle Evans AuthorDate: 2022-11-02 03:54:18 +0000 Commit: Kyle Evans 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