From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/gnu-efi/
Date: Mon, 30 May 2022 20:52:22 +0000 (UTC) [thread overview]
Message-ID: <1653943938.d06fd5424d9027cae92f58505404114bb2fc9216.floppym@gentoo> (raw)
commit: d06fd5424d9027cae92f58505404114bb2fc9216
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 20:49:58 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon May 30 20:52:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06fd542
sys-boot/gnu-efi: add REQUIRED_USE for ABI_X86 flags
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
index 76d4ef4d4221..ca53e5d6897f 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
@@ -18,6 +18,10 @@ LICENSE="GPL-2+ BSD BSD-2"
SLOT="0"
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.
@@ -63,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
next reply other threads:[~2022-05-30 20:52 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-30 20:52 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-27 17:08 [gentoo-commits] repo/gentoo:master commit in: sys-boot/gnu-efi/ Viorel Munteanu
2024-09-09 18:08 Viorel Munteanu
2024-09-05 12:11 Sam James
2024-09-05 12:11 Sam James
2024-09-05 12:11 Sam James
2024-08-28 15:14 Viorel Munteanu
2024-08-26 4:34 Viorel Munteanu
2024-08-02 4:53 Viorel Munteanu
2024-07-29 6:04 Viorel Munteanu
2024-07-25 11:47 Sam James
2024-07-25 11:47 Sam James
2024-07-25 11:41 Sam James
2024-07-25 11:41 Sam James
2024-06-17 19:01 Viorel Munteanu
2024-06-17 5:52 Viorel Munteanu
2024-05-29 12:15 Sam James
2024-05-29 5:37 Joonas Niilola
2024-05-28 22:01 Sam James
2024-04-23 20:30 Mike Gilbert
2024-04-23 19:42 Sam James
2024-04-23 19:42 Sam James
2023-11-27 20:22 Arthur Zamarin
2023-11-27 20:22 Arthur Zamarin
2023-11-27 19:22 Sam James
2023-11-27 19:22 Sam James
2023-09-06 8:02 David Seifert
2023-09-05 20:49 David Seifert
2023-09-05 20:49 David Seifert
2023-06-01 20:12 Sam James
2023-06-01 20:12 Sam James
2023-06-01 20:05 Sam James
2023-06-01 20:04 Sam James
2022-08-14 13:30 Sam James
2022-08-13 7:08 Agostino Sarubbo
2022-08-13 6:58 Agostino Sarubbo
2022-08-13 5:05 Arthur Zamarin
2022-08-12 18:16 Mike Gilbert
2022-05-30 20:52 Mike Gilbert
2022-02-09 5:52 Yixun Lan
2021-08-28 13:47 Mike Gilbert
2021-08-28 13:47 Mike Gilbert
2020-09-26 9:05 Sergei Trofimovich
2020-06-24 0:10 Mike Gilbert
2020-06-24 0:10 Mike Gilbert
2020-04-07 10:21 Mart Raudsepp
2020-04-01 21:14 Sergei Trofimovich
2020-02-07 13:16 Agostino Sarubbo
2020-02-07 12:12 Agostino Sarubbo
2020-02-06 8:26 Sergei Trofimovich
2020-02-05 14:18 Agostino Sarubbo
2019-11-25 0:57 Mike Gilbert
2019-11-25 0:57 Mike Gilbert
2019-07-06 19:22 Mike Gilbert
2018-07-19 15:22 Mike Gilbert
2018-05-02 6:59 Sergei Trofimovich
2018-01-27 17:46 Sergei Trofimovich
2017-07-09 15:14 Mike Gilbert
2017-07-09 15:14 Mike Gilbert
2017-07-02 11:08 Sergei Trofimovich
2017-07-02 11:08 Sergei Trofimovich
2017-04-25 23:30 Mike Gilbert
2017-02-05 4:39 Mike Gilbert
2017-02-05 4:25 Mike Gilbert
2017-02-05 4:23 Mike Gilbert
2017-02-05 4:23 Mike Gilbert
2016-11-18 19:17 Mike Gilbert
2016-06-03 16:15 Mike Gilbert
2016-01-16 8:17 Mike Frysinger
2016-01-16 8:17 Mike Frysinger
2015-11-08 19:43 Mike Gilbert
2015-11-08 19:29 Mikle Kolyada
2015-10-23 9:05 Agostino Sarubbo
2015-09-06 2:29 Mike Gilbert
2015-09-05 19:32 Mike Gilbert
2015-08-19 4:24 Doug Goldstein
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1653943938.d06fd5424d9027cae92f58505404114bb2fc9216.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox