diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
| commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
| tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /sys-boot/gnu-efi | |
| parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) | |
gentoo resync : 29.12.2022
Diffstat (limited to 'sys-boot/gnu-efi')
| -rw-r--r-- | sys-boot/gnu-efi/Manifest | 2 | ||||
| -rw-r--r-- | sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest index 36468ab0128a..dcecdd9e270a 100644 --- a/sys-boot/gnu-efi/Manifest +++ b/sys-boot/gnu-efi/Manifest @@ -2,5 +2,5 @@ AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af DIST gnu-efi-3.0.12.tar.bz2 154575 BLAKE2B 264e04351cf1ef74956e65d209c00514c0f56c18427a87a894132e5a5b0b09b3ca992475a2f95aac42c8a26ff4977ec837ff473d76c1c766049e903f03bd9fff SHA512 cbec6f6e37271c22c71e3ce44d3579e48e7f3b797ec3946f56eb843ed3e472722763c566fc3b749f0c692ab6cb26e8909bb258cd164771a5b1eeff5c7cd51368 DIST gnu-efi-3.0.14.tar.bz2 159295 BLAKE2B c7f9127d3bb7e5e2bc52f5fc7be3376ddc5076b262e5db5a30a997cf10bf10288da63ded64d11327fad09190a803ce26e82b32aea2d8525ee0d1e1a23ebadff2 SHA512 37420ba3804e8547451a7b143a689ceb6af0557234fa7801efdeba3c2fc581a5354fe34cbaacb338d7b394d913e7274098ebf07026b7c1d50b2236d7f86c470c EBUILD gnu-efi-3.0.12.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d -EBUILD gnu-efi-3.0.14.ebuild 1794 BLAKE2B 43990bcd83b91d9872b469189ce929d46cd126d364a9fd1db773fbea4813acb0fa3284bfc28c5afc43b44c3be532eca76292670b401f5039e1755966de0135c2 SHA512 687a2206ece8adbaa40f38c64ab8819a55f575d91e5068e3420eeed5a7c30f4b2805013a5906a56507af265eccc8b0d6b748cb5843ee883121c05104a8b2ae1f +EBUILD gnu-efi-3.0.14.ebuild 1914 BLAKE2B a56a217406b98741e472504df0e7e5ad33d6b3ba40cd1ea7f78378b6151e9134083d9b43635fd8b76855a717742a3553ddf94bbf89b648e65cebfa8b7d2fb3cf SHA512 a08046a2f8a309d692d3ec5b65f84cd35633ac2ba40b51024c69aa2e583bf2f99790566b92ccad993a289970384c814e536e505ae21cdfeaf31764802e1127c4 MISC metadata.xml 324 BLAKE2B 7eff39b7405a7a2e574ca870890052a58dfcf612d2a5057dffda9aa7d674ead8884acac2bda143586d8d20000cb4e9e35f044fd2618386c7f4577d8014b899a2 SHA512 9ee2a23d2c9ac583a55b2e2d92652121f4ff11f8f40a0caa13d5a52fa61259814044ec106b46be0cc741cbdf68414c55c4da96b46328a96f5a1ec1d0e1fa11d6 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..e3a8a8bf07f7 100644 --- a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild +++ b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Library for build EFI Applications" HOMEPAGE="https://sourceforge.net/projects/gnu-efi/" @@ -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 |