From 92c14d10f84af3245b94aedabacfbbf17de7d072 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 23 Nov 2023 14:48:36 +0100 Subject: [PATCH] sys-boot/gnu-efi: Sync with Gentoo It's from Gentoo commit 31a84c73e7c9b2a77d968c2506ae333aed367414. --- .../portage-stable/sys-boot/gnu-efi/Manifest | 4 +-- ...fi-3.0.14.ebuild => gnu-efi-3.0.15.ebuild} | 21 +++++++----- ...fi-3.0.12.ebuild => gnu-efi-3.0.17.ebuild} | 32 +++++++++---------- 3 files changed, 31 insertions(+), 26 deletions(-) rename sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/{gnu-efi-3.0.14.ebuild => gnu-efi-3.0.15.ebuild} (77%) rename sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/{gnu-efi-3.0.12.ebuild => gnu-efi-3.0.17.ebuild} (72%) diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/Manifest b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/Manifest index 4379342f4c..d5bd0bf8a0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/Manifest @@ -1,2 +1,2 @@ -DIST gnu-efi-3.0.12.tar.bz2 154575 BLAKE2B 264e04351cf1ef74956e65d209c00514c0f56c18427a87a894132e5a5b0b09b3ca992475a2f95aac42c8a26ff4977ec837ff473d76c1c766049e903f03bd9fff SHA512 cbec6f6e37271c22c71e3ce44d3579e48e7f3b797ec3946f56eb843ed3e472722763c566fc3b749f0c692ab6cb26e8909bb258cd164771a5b1eeff5c7cd51368 -DIST gnu-efi-3.0.14.tar.bz2 159295 BLAKE2B c7f9127d3bb7e5e2bc52f5fc7be3376ddc5076b262e5db5a30a997cf10bf10288da63ded64d11327fad09190a803ce26e82b32aea2d8525ee0d1e1a23ebadff2 SHA512 37420ba3804e8547451a7b143a689ceb6af0557234fa7801efdeba3c2fc581a5354fe34cbaacb338d7b394d913e7274098ebf07026b7c1d50b2236d7f86c470c +DIST gnu-efi-3.0.15.tar.bz2 159399 BLAKE2B 0df93d8cacfa1e6d4b7731e32287d4386da9375c5e5c5847df8a29c99d70f5c24b14abc5e44ab9d0a39a6ec96682eb2b5e84d81a5a142d44a50a522a4ae0e3c2 SHA512 64d408b6d115bdc6eebae12fbd6cd907ed5f847f54e506c1e8f8ea5de38a95cf6fac66ab1009bd1d0bd2d54ad45ad598d29bcc303926a5899bf5cc25448cbb2f +DIST gnu-efi-3.0.17.tar.bz2 165568 BLAKE2B 27f8171b411a6a8a138d44d91c7e4e4291aa399562825d51a398913572119482ffeb303d7508ae13eacd2cd10b8f5098405ab16eb56243587efe93235f661285 SHA512 0893ca234272584f889b1ae1c75341a9ceee60acfd32765daa5d704191ba00450536a287b949304c6d055d1bf125cc29e24fc41df8e5230e0da4f9d944876512 diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.15.ebuild similarity index 77% rename from sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild rename to sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.15.ebuild index 44b683ddf6..77a14fb4a3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.15.ebuild @@ -1,9 +1,9 @@ -# Copyright 2004-2021 Gentoo Authors +# Copyright 2004-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Library for build EFI Applications" HOMEPAGE="https://sourceforge.net/projects/gnu-efi/" @@ -16,8 +16,12 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2" # - GPL-2+ : setjmp_ia32.S LICENSE="GPL-2+ BSD BSD-2" SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~x86" +KEYWORDS="-* amd64 arm arm64 ~ia64 ~riscv x86" IUSE="abi_x86_32 abi_x86_64 custom-cflags" +REQUIRED_USE=" + amd64? ( || ( abi_x86_32 abi_x86_64 ) ) + x86? ( || ( abi_x86_32 abi_x86_64 ) ) +" # These objects get run early boot (i.e. not inside of Linux), # so doing these QA checks on them doesn't make sense. @@ -38,6 +42,7 @@ efimake() { aarch64*) arch=aarch64 ;; ia64*) arch=ia64 ;; i?86*) arch=ia32 ;; + riscv64*) arch=riscv64;; x86_64*) arch=x86_64 ;; *) die "Unknown CHOST" ;; esac @@ -62,18 +67,18 @@ src_compile() { unset CFLAGS CPPFLAGS LDFLAGS fi - if [[ ${CHOST} == x86_64* ]]; then + if use amd64 || use x86; then use abi_x86_32 && CHOST=i686 ABI=x86 efimake - use abi_x86_64 && efimake + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake else efimake fi } src_install() { - if [[ ${CHOST} == x86_64* ]]; then + if use amd64 || use x86; then use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install - use abi_x86_64 && efimake INSTALLROOT="${D}" install + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install else efimake INSTALLROOT="${D}" install fi diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.12.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.17.ebuild similarity index 72% rename from sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.12.ebuild rename to sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.17.ebuild index 8cf6e78f27..9643ef3a8b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.17.ebuild @@ -1,9 +1,9 @@ -# Copyright 2004-2020 Gentoo Authors +# Copyright 2004-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Library for build EFI Applications" HOMEPAGE="https://sourceforge.net/projects/gnu-efi/" @@ -16,8 +16,12 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2" # - GPL-2+ : setjmp_ia32.S LICENSE="GPL-2+ BSD BSD-2" SLOT="0" -KEYWORDS="-* amd64 arm arm64 ~ia64 x86" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86" IUSE="abi_x86_32 abi_x86_64 custom-cflags" +REQUIRED_USE=" + amd64? ( || ( abi_x86_32 abi_x86_64 ) ) + x86? ( || ( abi_x86_32 abi_x86_64 ) ) +" # These objects get run early boot (i.e. not inside of Linux), # so doing these QA checks on them doesn't make sense. @@ -38,6 +42,7 @@ efimake() { aarch64*) arch=aarch64 ;; ia64*) arch=ia64 ;; i?86*) arch=ia32 ;; + riscv64*) arch=riscv64;; x86_64*) arch=x86_64 ;; *) die "Unknown CHOST" ;; esac @@ -49,6 +54,7 @@ efimake() { AS="${AS}" LD="${LD}" AR="${AR}" + OBJCOPY="${OBJCOPY}" PREFIX="${EPREFIX}/usr" LIBDIR='$(PREFIX)'/$(get_libdir) ) @@ -56,30 +62,24 @@ efimake() { } src_compile() { - tc-export BUILD_CC AR AS CC LD + tc-export BUILD_CC AR AS CC LD OBJCOPY - if use custom-cflags; then - # https://bugs.gentoo.org/607992 - filter-mfpmath sse - - # https://bugs.gentoo.org/619628 - append-flags $(test-flags-CC -mno-avx) - else + if ! use custom-cflags; then unset CFLAGS CPPFLAGS LDFLAGS fi - if [[ ${CHOST} == x86_64* ]]; then + if use amd64 || use x86; then use abi_x86_32 && CHOST=i686 ABI=x86 efimake - use abi_x86_64 && efimake + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake else efimake fi } src_install() { - if [[ ${CHOST} == x86_64* ]]; then + if use amd64 || use x86; then use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install - use abi_x86_64 && efimake INSTALLROOT="${D}" install + use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install else efimake INSTALLROOT="${D}" install fi