| 1 |
commit: d06fd5424d9027cae92f58505404114bb2fc9216 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 30 20:49:58 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 30 20:52:18 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d06fd542 |
| 7 |
|
| 8 |
sys-boot/gnu-efi: add REQUIRED_USE for ABI_X86 flags |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild | 12 ++++++++---- |
| 13 |
1 file changed, 8 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild |
| 16 |
index 76d4ef4d4221..ca53e5d6897f 100644 |
| 17 |
--- a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild |
| 18 |
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild |
| 19 |
@@ -18,6 +18,10 @@ LICENSE="GPL-2+ BSD BSD-2" |
| 20 |
SLOT="0" |
| 21 |
KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86" |
| 22 |
IUSE="abi_x86_32 abi_x86_64 custom-cflags" |
| 23 |
+REQUIRED_USE=" |
| 24 |
+ amd64? ( || ( abi_x86_32 abi_x86_64 ) ) |
| 25 |
+ x86? ( || ( abi_x86_32 abi_x86_64 ) ) |
| 26 |
+" |
| 27 |
|
| 28 |
# These objects get run early boot (i.e. not inside of Linux), |
| 29 |
# so doing these QA checks on them doesn't make sense. |
| 30 |
@@ -63,18 +67,18 @@ src_compile() { |
| 31 |
unset CFLAGS CPPFLAGS LDFLAGS |
| 32 |
fi |
| 33 |
|
| 34 |
- if [[ ${CHOST} == x86_64* ]]; then |
| 35 |
+ if use amd64 || use x86; then |
| 36 |
use abi_x86_32 && CHOST=i686 ABI=x86 efimake |
| 37 |
- use abi_x86_64 && efimake |
| 38 |
+ use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake |
| 39 |
else |
| 40 |
efimake |
| 41 |
fi |
| 42 |
} |
| 43 |
|
| 44 |
src_install() { |
| 45 |
- if [[ ${CHOST} == x86_64* ]]; then |
| 46 |
+ if use amd64 || use x86; then |
| 47 |
use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install |
| 48 |
- use abi_x86_64 && efimake INSTALLROOT="${D}" install |
| 49 |
+ use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install |
| 50 |
else |
| 51 |
efimake INSTALLROOT="${D}" install |
| 52 |
fi |
Archives