commit: f18c709e191b6725d43f4f386b5cb19e7d4f7c21 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Mon Sep 9 17:50:09 2024 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Mon Sep 9 18:08:24 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f18c709e
sys-boot/gnu-efi: fix building on arm Broken when trying to implement a workaround for bug #931792. Checking if objcopy supports PE fails on arm. Closes: https://bugs.gentoo.org/939338 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> .../gnu-efi/{gnu-efi-3.0.18-r4.ebuild => gnu-efi-3.0.18-r5.ebuild} | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.18-r4.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild similarity index 91% rename from sys-boot/gnu-efi/gnu-efi-3.0.18-r4.ebuild rename to sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild index 7185e2dbb78c..d492de252a80 100644 --- a/sys-boot/gnu-efi/gnu-efi-3.0.18-r4.ebuild +++ b/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild @@ -42,7 +42,12 @@ check_and_set_objcopy() { # llvm-objcopy does not support EFI target, try to use binutils objcopy or fail tc-export OBJCOPY OBJCOPY="${OBJCOPY/llvm-/}" - LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target" + if ! use arm && ! use riscv; then + # bug #939338 + # objcopy does not understand PE/COFF on these arches: arm32, riscv64 and mips64le + # gnu-efi containes a workaround + LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target" + fi fi }
