From nobody Fri Sep 09 22:21:19 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 4MPVnq4xbQz4bW20; Fri, 9 Sep 2022 22:21:19 +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 4MPVnq3wS3z3cTJ; Fri, 9 Sep 2022 22:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662762079; 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=OHqjjdyrq6uLivrSLoXmgfS8C8CIC+Ax8Ms/VxN9nQg=; b=dbf3qxeRnOSAGNBZDZpJqO62bX55TuWBcgHM7nB26FM/EuxZ1VcqpxZF+O5j2JDJ0VhOsy JaB5U5jF87zQzCwKV/63kxQZZS9zO16Bxi+0ZfzdbJ17gzAitvtVIW/8ZeyWG3p4H1uRzX BQZQssfJ8ImhypiMh3YQSqjHYMLiRpZF5cZrVpgVBTLY3uJTKULJ+6ihEjuCXAisQSLE+k UzHuRoxxEF0jFKdibN7PWXGJu2K4ci7y5Xxqd9s+pgh9tNLln1JJKYroJ4d0/RbHdoTZxz loBv5d1+ODJS3G2IaZ5dJmQkNjwKkkLv4xKggLONAzMv5KPN3+qAGgtNbEyWFA== 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 4MPVnq2zkfz1L9Z; Fri, 9 Sep 2022 22:21:19 +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 289MLJiI029661; Fri, 9 Sep 2022 22:21:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 289MLJco029660; Fri, 9 Sep 2022 22:21:19 GMT (envelope-from git) Date: Fri, 9 Sep 2022 22:21:19 GMT Message-Id: <202209092221.289MLJco029660@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Lorenzo Salvadore Subject: git: 675ef8421cde - main - sysutils/edk2: Fix build with GCC 12 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: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 675ef8421cde2569121e3b623c481f25d2de6c34 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662762079; 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=OHqjjdyrq6uLivrSLoXmgfS8C8CIC+Ax8Ms/VxN9nQg=; b=v8/G1ThjU1WbSZJxu4jprYmA0KzLewpV902h7JjT5pahi2l4Yud1aSNBbPR9NhhksyOOrH fAv98fSBYvL20B9BL4/nPgkIeKSZg7LxLFPHpu/jSfKpzx6Zgs7jDc9RiUWaBb2UzLY3ju SFqX8cWZ+CXEDPa5GWS6HHBh/VuGykf3EcdfN7b/AS3i9OQMPmJNjs7f2I2kK8pI8yXyD0 RS/Vnhh+RD/hKiPnXTlnP+bbKO8QGnWk4CLlLAumScMYYTFuoqVVNJBT/2LEpCVO/m0qah tkgP0E4vEnFzhws60ZaiTmzkTjU/xZ6Ufm2MiU0QK/x9HvXeWCD2nZPCI0qy7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662762079; a=rsa-sha256; cv=none; b=Ozyv0g368x5EizLaTC5G4H42mhgHFmHioa6gMECXwx4vFEPn+9eaML10aR+qzWaeS3COdR m/hlQkSfKG5B3UnSex8Gr4Q6n+/I+cK93hoJopsYfTlLvSlj/nbnB+O3q3XoWCZrQRd78b EFWoVol1YdX6WOm+XY26aKYuOAtnwevmQDzFHLS7aS6+MHrj97RBJylON2mXnmShgMSnA1 U6VOGIKLHh1Lcg9aJDlAdwoiXFxCsHQmiIG/idLs0UiIWA7wZsOF4o7lM8JJLnsVIkG+n4 CTCDxIq2YyoONlNFb4RFKUspkijIODb/9kHDsaee05MIELTQ/PnpSPx/HTtUnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by salvadore: URL: https://cgit.FreeBSD.org/ports/commit/?id=675ef8421cde2569121e3b623c481f25d2de6c34 commit 675ef8421cde2569121e3b623c481f25d2de6c34 Author: Oleg Sidorkin AuthorDate: 2022-09-09 22:02:50 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-09-09 22:19:51 +0000 sysutils/edk2: Fix build with GCC 12 - Backport two upstreamed patches. - Fix ar path. While here, pet portlint. PR: 263543 Reported by: exp-run (antoine) Approved by: manu --- sysutils/edk2/Makefile | 11 ++++++++--- sysutils/edk2/distinfo | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile index 2a69e0725b6e..c1745cd284ce 100644 --- a/sysutils/edk2/Makefile +++ b/sysutils/edk2/Makefile @@ -3,6 +3,10 @@ PORTVERSION= g202202 PORTREVISION= 1 CATEGORIES= sysutils +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= 22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c.patch:-p1 \ + 85021f8cf22d1bd4114803c6c610dea5ef0059f1.patch:-p1 + MAINTAINER= uboot@FreeBSD.org COMMENT= EDK2 Firmware for ${FLAVOR} @@ -38,6 +42,7 @@ GH_TUPLE= tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \ BINARY_ALIAS= make=${LOCALBASE}/bin/gmake \ dtc=${LOCALBASE}/bin/dtc \ + ar=${AR} \ gcc=${LOCALBASE}/bin/gcc${GCC_DEFAULT} \ gcc-ar=${LOCALBASE}/bin/gcc-ar${GCC_DEFAULT} \ g++=${LOCALBASE}/bin/g++${GCC_DEFAULT} \ @@ -98,7 +103,7 @@ PLAT_FILENAME= XEN_X64_EFI.fd .if ${FLAVOR} == bhyve ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= Bhyve only runs on x64 +ONLY_FOR_ARCHS_REASON= Bhyve only runs on x64 PLAT= bhyve PLAT_ARCH= X64 PLAT_TARGET= RELEASE @@ -107,8 +112,8 @@ PLAT_RESULT= BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE.fd PLAT_RESULT_CODE= BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_CODE.fd PLAT_RESULT_VARS= BhyveX64/${PLAT_TARGET}_GCC5/FV/BHYVE_VARS.fd PLAT_FILENAME= BHYVE_UEFI.fd -PLAT_FILENAME_CODE = BHYVE_UEFI_CODE.fd -PLAT_FILENAME_VARS = BHYVE_UEFI_VARS.fd +PLAT_FILENAME_CODE= BHYVE_UEFI_CODE.fd +PLAT_FILENAME_VARS= BHYVE_UEFI_VARS.fd .endif .if ${FLAVOR} == qemu_x64 diff --git a/sysutils/edk2/distinfo b/sysutils/edk2/distinfo index 1513f8ccf451..bdc6e79e8afd 100644 --- a/sysutils/edk2/distinfo +++ b/sysutils/edk2/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1651509764 +TIMESTAMP = 1653575598 SHA256 (tianocore-edk2-g202202-edk2-stable202202_GH0.tar.gz) = 072e84dfe3c8fbb35bb058dcc8b0f623fe831cead74ba81b0f8236d00a03e947 SIZE (tianocore-edk2-g202202-edk2-stable202202_GH0.tar.gz) = 14208170 SHA256 (tianocore-edk2-platforms-38855c56_GH0.tar.gz) = 87324cb01f3460a681155b5d12b2e19fa00638a0366c300813c507a1cbe081cb @@ -15,3 +15,7 @@ SHA256 (google-brotli-v1.0.9-35-gf4153a0_GH0.tar.gz) = 8deff90317f030d770ab912fb SIZE (google-brotli-v1.0.9-35-gf4153a0_GH0.tar.gz) = 512041 SHA256 (akheron-jansson-v2.13.1_GH0.tar.gz) = f22901582138e3203959c9257cf83eba9929ac41d7be4a42557213a22ebcc7a0 SIZE (akheron-jansson-v2.13.1_GH0.tar.gz) = 144979 +SHA256 (22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c.patch) = d7e7e46f5c84abc222343182c7c4dfef26cbb78b5a0269514466221211fe050b +SIZE (22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c.patch) = 1672 +SHA256 (85021f8cf22d1bd4114803c6c610dea5ef0059f1.patch) = d4e68faead64d7b808b32bb37aac110f0d7dd98433ec5d145e8de016d6d9ba0a +SIZE (85021f8cf22d1bd4114803c6c610dea5ef0059f1.patch) = 2068