gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 06:48:18 -07:00
Code Issues Projects Releases Wiki Activity

sys-boot/syslinux: replace efi32 and efi64 with ABI_X86 flags

Browse Source 
Closes: https://bugs.gentoo.org/584464
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
This commit is contained in:
Mike Gilbert
2022-05-30 16:28:26 -04:00
parent c9a948a573
commit c8cb8a9930
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sys-boot/syslinux/metadata.xml
View File

@@ -10,8 +10,7 @@
</maintainer>
<use>
<flag name="bios">Enable BIOS support</flag>
<flag name="efi32">Enable 32-bit EFI support</flag>
<flag name="efi64">Enable 64-bit EFI support</flag>
<flag name="efi">Enable EFI support</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id>

29
sys-boot/syslinux/syslinux-6.04_pre3.ebuild
View File

@@ -13,8 +13,9 @@ SRC_URI="https://git.zytor.com/syslinux/syslinux.git/snapshot/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="-* ~amd64 ~x86"
IUSE="+bios efi32 efi64"
REQUIRED_USE="|| ( bios efi32 efi64 )"
IUSE="abi_x86_32 abi_x86_64 +bios +efi"
REQUIRED_USE="|| ( bios efi )
efi? ( || ( abi_x86_32 abi_x86_64 ) )"
BDEPEND="
dev-lang/perl
@@ -31,8 +32,7 @@ RDEPEND="
dev-perl/Digest-SHA1
"
DEPEND="${RDEPEND}
efi32? ( sys-boot/gnu-efi[abi_x86_32(-)] )
efi64? ( sys-boot/gnu-efi[abi_x86_64(-)] )
efi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] )
virtual/os-headers
"
@@ -69,21 +69,26 @@ src_compile() {
if use bios; then
emake bios
fi
if use efi32; then
efimake x86 efi32
fi
if use efi64; then
efimake amd64 efi64
if use efi; then
if use abi_x86_32; then
efimake x86 efi32
fi
if use abi_x86_64; then
efimake amd64 efi64
fi
fi
}
src_install() {
local firmware=( $(usev bios) )
if use efi; then
use abi_x86_32 && firmware+=( efi32 )
use abi_x86_64 && firmware+=( efi64 )
fi
local args=(
INSTALLROOT="${ED}"
MANDIR='$(DATADIR)/man'
$(usev bios)
$(usev efi32)
$(usev efi64)
"${firmware[@]}"
install
)
emake -j1 "${args[@]}"