From nobody Tue Nov 09 08:54:03 2021 X-Original-To: dev-commits-ports-all@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 8D324184FBCD; Tue, 9 Nov 2021 08:54:04 +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 4HpMGh311Tz4h9Z; Tue, 9 Nov 2021 08:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2E5C62218E; Tue, 9 Nov 2021 08:54:04 +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 1A98s31S067675; Tue, 9 Nov 2021 08:54:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A98s36f067674; Tue, 9 Nov 2021 08:54:03 GMT (envelope-from git) Date: Tue, 9 Nov 2021 08:54:03 GMT Message-Id: <202111090854.1A98s36f067674@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: dfd3f7e23b6a - main - sysutils/edk2: Remove aarch64-none-elf-gcc on aarch64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfd3f7e23b6a08182b5aebc142685ae8df10485a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfd3f7e23b6a08182b5aebc142685ae8df10485a commit dfd3f7e23b6a08182b5aebc142685ae8df10485a Author: Emmanuel Vadot AuthorDate: 2021-09-29 10:22:29 +0000 Commit: Emmanuel Vadot CommitDate: 2021-11-09 08:53:49 +0000 sysutils/edk2: Remove aarch64-none-elf-gcc on aarch64 We can use the native gcc (from USE_GCC) to build the ports so don't add another build dep. --- sysutils/edk2/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile index 503ff8fe42f7..65152f193e29 100644 --- a/sysutils/edk2/Makefile +++ b/sysutils/edk2/Makefile @@ -104,7 +104,9 @@ MAKE_ENV+= WORKSPACE=${WRKDIR} \ PYTHON_COMMAND=python3 \ PYTHONHASHSEED=1 -.if ${PLAT_ARCH} == AARCH64 +.include + +.if ${PLAT_ARCH} == AARCH64 && ${ARCH} != aarch64 BUILD_DEPENDS+= aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc MAKE_ENV+= GCC5_AARCH64_PREFIX=aarch64-none-elf- .endif @@ -131,4 +133,4 @@ do-install: ${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/ ${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} -.include +.include