gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-21 21:17:37 -08:00
Code Issues Projects Releases Wiki Activity

app-crypt/efitools: fix building w/ llvm profile

Browse Source 
1. ld.lld: error: section: .dynamic is not contiguous with other relro sections
   fix by force ld.bfd
2. llvm-objcopy: error: invalid output format: 'efi-app-x86_64'
   fix by force objcopy from binutils, check_and_set_objcopy is copied
   from sys-boot/gnu-efi

Closes: https://bugs.gentoo.org/934377
Closes: https://bugs.gentoo.org/953401
Signed-off-by: Z. Liu <zhixu.liu@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44380
Closes: https://github.com/gentoo/gentoo/pull/44380
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
This commit is contained in:
Z. Liu 2025-10-30 14:09:33 +08:00 committed by Viorel Munteanu
parent ec4c44e88f
commit 9b184c5de6
No known key found for this signature in database
GPG Key ID: 0CE5A97D9310DAB0
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app-crypt/efitools/efitools-1.9.2-r1.ebuild
View File

@ -26,6 +26,7 @@ BDEPEND="
app-crypt/sbsigntools app-crypt/sbsigntools
dev-perl/File-Slurp dev-perl/File-Slurp
sys-apps/help2man sys-apps/help2man
sys-devel/binutils
virtual/pkgconfig" virtual/pkgconfig"
PATCHES=( PATCHES=(
@ -34,6 +35,35 @@ PATCHES=(
"${FILESDIR}"/1.9.2-gcc15.patch "${FILESDIR}"/1.9.2-gcc15.patch
) )
check_and_set_objcopy() {
if [[ ${MERGE_TYPE} != "binary" ]]; then
# bug #931792
# llvm-objcopy does not support EFI target, try to use binutils objcopy or fail
tc-export OBJCOPY
OBJCOPY="${OBJCOPY/llvm-/}"
# Test OBJCOPY to see if it supports EFI targets, and return if it does
LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' && return 0
# If OBJCOPY does not support EFI targets, it is possible that the 'objcopy' on our path is
# still LLVM if the 'binutils-plugin' USE flag is set. In this case, we check to see if the
# '(prefix)/usr/bin/objcopy' binary is available (it should be, it's a dependency), and if
# so, we use the absolute path explicitly.
local binutils_objcopy="${EPREFIX}"/usr/bin/"${OBJCOPY}"
if [[ -e "${binutils_objcopy}" ]]; then
OBJCOPY="${binutils_objcopy}"
fi
if ! use arm && ! use riscv; then
# bug #939338
# objcopy does not understand PE/COFF on these arches: arm32, riscv64 and mips64le
# gnu-efi contains a workaround
LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target"
fi
fi
}
pkg_setup() {
check_and_set_objcopy
}
src_prepare() { src_prepare() {
default default
@ -42,6 +72,10 @@ src_prepare() {
sed -i -e 's/-fno-toplevel-reorder//g' Make.rules || die sed -i -e 's/-fno-toplevel-reorder//g' Make.rules || die
fi fi
if tc-ld-is-lld; then
tc-ld-force-bfd
fi
if use static; then if use static; then
append-ldflags -static append-ldflags -static
export STATIC_FLAG=--static export STATIC_FLAG=--static