From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3A45F15808B for ; Fri, 27 Sep 2024 17:08:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65CBCE2A4C; Fri, 27 Sep 2024 17:08:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F96CE2A4C for ; Fri, 27 Sep 2024 17:08:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9838B3430D2 for ; Fri, 27 Sep 2024 17:08:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02CF427F6 for ; Fri, 27 Sep 2024 17:08:03 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1727456841.d25b3f6cfcf28716f030b7a7fea3206a5fc4dffd.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/gnu-efi/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild X-VCS-Directories: sys-boot/gnu-efi/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: d25b3f6cfcf28716f030b7a7fea3206a5fc4dffd X-VCS-Branch: master Date: Fri, 27 Sep 2024 17:08:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: faa637a7-f275-4473-b6c8-b9aaa3b6cc4e X-Archives-Hash: e4b514868fa735b327d3759f7d13030d commit: d25b3f6cfcf28716f030b7a7fea3206a5fc4dffd Author: Maide maide ca> AuthorDate: Thu Sep 26 17:00:25 2024 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Fri Sep 27 17:07:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d25b3f6c sys-boot/gnu-efi: Fix compile when LLVM `binutils-plugin` USE flag is set LLVM's objcopy is being used instead of the GNU version when `binutils-plugin` is enabled. I tried to avoid this by explictly using the GNU path for objcopy when our initial test fails. Let me know if this isn't acceptable, or if you need me to open a new bug for this. It was basically the same repo as the linked issue, but the fix did not work, as `which objcopy` returns '/usr/lib/llvm/18/bin/objcopy' instead of '/usr/bin/objcopy'. Bug: https://bugs.gentoo.org/931792 Signed-off-by: Maide maide.ca> Closes: https://github.com/gentoo/gentoo/pull/38785 Signed-off-by: Viorel Munteanu gentoo.org> sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild | 10 ++++++++++ sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild index 511b4e30b24d..26cfa7b58d27 100644 --- a/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild +++ b/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild @@ -42,6 +42,16 @@ check_and_set_objcopy() { # 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 '\