From nobody Fri Oct 21 22:00:38 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 4MvJLb09lhz4fTmT; Fri, 21 Oct 2022 22:00:39 +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 4MvJLZ6lrcz3cV7; Fri, 21 Oct 2022 22:00:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666389638; 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=H47WSClEB2UlfrW5ws0SQwfqwpmPXwnzN2ldFo3dWpg=; b=Bvwx0VzlGWryfbO1De6woKb72bLflL/sOPbBXUqEdmom4g9sRoNO30rIjVJ2+NBrEYc8mB WCtpgNIOePOTU9Vuak//0KtSBGm62UyL/ITpNQQbXsKv6iB8mZ++s2tyAjnR4VEzkJFBgW N94UAP3QLvvxNSzl219HADLKlMgx6Wifc1mdc7s80P2c2mRl9nUi0+QT5H1bLJJCqzHfts hkinntQkmb7CUB87B1ZNona6Y9xVNh7CZbwGz2dDB8coDAczFFs66lM2yZXBn58+1z59gs kWMYyhJk74RUH9+WHKsVEdBwI8llTvC5/8TLg0qNPdAWrwbia4EV3P7DuCAlPw== 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 4MvJLZ5qQ2zLc4; Fri, 21 Oct 2022 22:00:38 +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 29LM0c4S003163; Fri, 21 Oct 2022 22:00:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29LM0c6S003162; Fri, 21 Oct 2022 22:00:38 GMT (envelope-from git) Date: Fri, 21 Oct 2022 22:00:38 GMT Message-Id: <202210212200.29LM0c6S003162@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: 819bf69c1560 - main - sysutils/edk2: Fix build on 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: salvadore X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 819bf69c15605e1e31998c91fb3fd02d5bc9fa0f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666389638; 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=H47WSClEB2UlfrW5ws0SQwfqwpmPXwnzN2ldFo3dWpg=; b=pKpcFm5eP+yNdxQMee+n9fwOLuqlRMKCMjsLE662c0FXZhWled66hmrq1RePa4/GhF8poM iyCWFs9+o/bEAFreYgZKH1F+yxXPSd35xjrC7mwsQr6uFgy2TkYhqeSWwaO+wVeAqbS/RR letM79WdwbzrGxOnORym/84vXe5eG4Y5Ww9UtAqxATMX/tQ3fQ9yh8x5iZFhVACMlZwVYW jLmfkj5nZuzMuXYPgN5WquT8QXJ8gr3XS/Vts2xAJZ4yyV0jkwocNaUMVaaOrLIvBPIe4J g3F3zY9HXlvIQouDaUGIiwJlu+Jzkc80FUt2Sd7P4VUn98gYzyLarFAFWwnR6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666389638; a=rsa-sha256; cv=none; b=dR7124gMGSPU+srt/4PuwCYgnMVENqzMI/ytLDzw6zjqThFkpk8m6sYduo+GDd39DqClHg nc5iJXMFY+QK4YoMXlCWgbfpv/nqfYO/PEC+OSZB5rOHcerzlipbCoo0ZDtj0sJ3wsOBSW +0s4FNvmwjFueYOhLYXTjRSKDg1sAYe3eDez899b5c//kkrFu3nOfKNtLpFho29yDJMMkS 2yhXmJv5XciiTvChlnvV5kZ27Y+o2/VxZTLFsqoH9NDRfLeehcYl3PJF3zkosaqt0Dlnte wRnezKKtnsSt/JznwHASSElNRWg5oELGciKVmD0xMRaAqUwT+lX60qOhw4Mu+Q== 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=819bf69c15605e1e31998c91fb3fd02d5bc9fa0f commit 819bf69c15605e1e31998c91fb3fd02d5bc9fa0f Author: Mark Millard AuthorDate: 2022-10-21 21:47:14 +0000 Commit: Lorenzo Salvadore CommitDate: 2022-10-21 22:00:03 +0000 sysutils/edk2: Fix build on aarch64 Build on aarch64 was failing with the following error: ld-elf.so.1: /lib/libgcc_s.so.1: version GCC_4.5.0 required by /usr/local/lib/gcc11/libstdc++.so.6 not found Fix by using /usr/local/lib/gcc*/libgcc_s.so.1 instead. While here, also define WWW variable. PR: 266404 Approved by: imp (uboot) --- sysutils/edk2/Makefile | 51 +++++++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile index c1745cd284ce..e883c7c5efc9 100644 --- a/sysutils/edk2/Makefile +++ b/sysutils/edk2/Makefile @@ -9,6 +9,7 @@ PATCHFILES= 22130dcd98b4d4b76ac8d922adb4a2dbc86fa52c.patch:-p1 \ MAINTAINER= uboot@FreeBSD.org COMMENT= EDK2 Firmware for ${FLAVOR} +WWW= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/ReadMe.rst LICENSE= BSD3CLAUSE @@ -40,15 +41,22 @@ GH_TUPLE= tianocore:edk2-platforms:${PLATFORM_TAG}:platforms \ google:brotli:v1.0.9-35-gf4153a0:brotli/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \ akheron:jansson:v2.13.1:jansson/RedfishPkg/Library/JsonLib/jansson +.include + +# Heavily dependent on bsd.port.pre.mk definitions for lang/gcc* details: 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} \ + gcc=${LOCALBASE}/bin/${CC} \ + gcc-ar=${LOCALBASE}/bin/${CC:S/gcc/&-ar/} \ + g++=${LOCALBASE}/bin/${CXX} \ python3=${PYTHON_CMD} python=${PYTHON_CMD} -.include +# Avoid: "ld-elf.so.1: /lib/libgcc_s.so.1: version GCC_4.5.0 +# required by /usr/local/lib/gcc11/libstdc++.so.6 not found" +# (that is from /lib/libgcc_s.so.1 having incomplete/inaccurate +# coverage for aarch64 g++ code generation's use of libgcc_s.so.1 ): +EXTRA_LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME} .if ${FLAVOR} == fvp PLAT= fvp @@ -117,8 +125,8 @@ PLAT_FILENAME_VARS= BHYVE_UEFI_VARS.fd .endif .if ${FLAVOR} == qemu_x64 -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= Do not compile on hardware other than amd64 +ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS_REASON= Do not compile on hardware other than amd64 PLAT= qemu PLAT_ARCH= X64 PLAT_TARGET= RELEASE @@ -127,23 +135,23 @@ PLAT_RESULT= OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF.fd PLAT_RESULT_CODE= OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd PLAT_RESULT_VARS= OvmfX64/${PLAT_TARGET}_GCC5/FV/OVMF_VARS.fd PLAT_FILENAME= QEMU_UEFI-x86_64.fd -PLAT_FILENAME_CODE = QEMU_UEFI_CODE-x86_64.fd -PLAT_FILENAME_VARS = QEMU_UEFI_VARS-x86_64.fd +PLAT_FILENAME_CODE= QEMU_UEFI_CODE-x86_64.fd +PLAT_FILENAME_VARS= QEMU_UEFI_VARS-x86_64.fd .endif .if ${FLAVOR} == qemu_i386 -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= Do not compile on hardware other than amd64 -PLAT= qemu -PLAT_ARCH= IA32 -PLAT_TARGET= RELEASE -PLATFILE= OvmfPkg/OvmfPkgIa32.dsc -PLAT_RESULT= OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF.fd -PLAT_RESULT_CODE= OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd -PLAT_RESULT_VARS= OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_VARS.fd -PLAT_FILENAME= QEMU_UEFI-i386.fd -PLAT_FILENAME_CODE = QEMU_UEFI_CODE-i386.fd -PLAT_FILENAME_VARS = QEMU_UEFI_VARS-i386.fd +ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS_REASON= Do not compile on hardware other than amd64 +PLAT= qemu +PLAT_ARCH= IA32 +PLAT_TARGET= RELEASE +PLATFILE= OvmfPkg/OvmfPkgIa32.dsc +PLAT_RESULT= OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF.fd +PLAT_RESULT_CODE= OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_CODE.fd +PLAT_RESULT_VARS= OvmfIa32/${PLAT_TARGET}_GCC5/FV/OVMF_VARS.fd +PLAT_FILENAME= QEMU_UEFI-i386.fd +PLAT_FILENAME_CODE= QEMU_UEFI_CODE-i386.fd +PLAT_FILENAME_VARS= QEMU_UEFI_VARS-i386.fd .endif PLIST_FILES= ${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME} @@ -166,7 +174,8 @@ MAKE_ENV+= WORKSPACE=${WRKDIR} \ EDK_TOOLS_PATH=${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools \ PATH=${WRKDIR}/edk2-${GH_TAGNAME}/BaseTools/BinWrappers/PosixLike:${PATH} \ PYTHON_COMMAND=python3 \ - PYTHONHASHSEED=1 + PYTHONHASHSEED=1 \ + EXTRA_LDFLAGS=${EXTRA_LDFLAGS} .if ${PLAT_ARCH} == AARCH64 && ${ARCH} != aarch64 BUILD_DEPENDS+= aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc