diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-09-28 01:25:58 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-09-28 01:25:58 +0100 |
| commit | 6405cba4bf18141460bc9fcb8f5580532d4b46f8 (patch) | |
| tree | 377baa366741990f54b18ea82f5566c48295f4e0 /sys-boot/gnu-efi | |
| parent | abc3bfc07d931f667a0f50cf607f1c8a49af879f (diff) | |
gentoo auto-resync : 28:09:2024 - 01:25:57
Diffstat (limited to 'sys-boot/gnu-efi')
| -rw-r--r-- | sys-boot/gnu-efi/Manifest | 4 | ||||
| -rw-r--r-- | sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild | 10 | ||||
| -rw-r--r-- | sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild | 10 |
3 files changed, 22 insertions, 2 deletions
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest index d70fb30ed5ef..87fe4effd27e 100644 --- a/sys-boot/gnu-efi/Manifest +++ b/sys-boot/gnu-efi/Manifest @@ -7,6 +7,6 @@ DIST gnu-efi-3.0.18.tar.bz2 167567 BLAKE2B e080fa4c57a281452a6473304871304d1b5c3 EBUILD gnu-efi-3.0.15.ebuild 1917 BLAKE2B cd98c39082b4d0e8bdf2181738b81a115842eb303ec196569a5beff5212339b20f13ec62a6f4a31fa14db3cd3f3d9fd22c0d7ade1eec40e7eea87d1ea86a8193 SHA512 fb622477b316beb65ad1e187920ab75df0d646410f8e953971b8cff9e162b4a80ef911cde2b239faf0b196b5ecb14b3d4105429be3154949036ee921679e0b16 EBUILD gnu-efi-3.0.17.ebuild 1948 BLAKE2B 6e9c1ea853cd12b47e60c25e889306698dbfba6cffb10fd7f7bac0ef3410d882559659d3f6f23f953d8c9071930a41875b0c75ca17b871bd3c852af891457dc3 SHA512 b5b46e15baca02080f3236ab796c8dfbed0c2cdf31593e9810304a9a853091492e47adb9429a7a82da6b50de5c6917f8a61a4588e78190d70af970d8126eb58e EBUILD gnu-efi-3.0.18-r2.ebuild 1932 BLAKE2B eb8c68e3bf9db5167fb31063217d3fd2c44e9aabd80ca24a6eac0834809839305cb4731dcd2aef15cd86cce97cd3795f6ce3a81c318ae481d1627ff10b7b29d2 SHA512 36d16e5d6d3846d4cd71577789095c6bd1c5a493a4e0d2edb3f1eb7006653765cb44534f4091c33239995371ad775e31bdf39520fb394c228ce870346480548d -EBUILD gnu-efi-3.0.18-r3.ebuild 2463 BLAKE2B 38973191d685470991769962b39532891ae437fb8cbbbf017d34cab389e99f2eeaecea98c778fc1497954e45c1e6327f7b99dfd15dc557be0865be284734a79b SHA512 129fdcbbd50aaca73acf6d499b126041496a2377bd2049e71ceb2e18cb5cc6e3737343d3c922b0fd86ef49fc4afc6110a1840481c07a357d0c0df47371ad88ab -EBUILD gnu-efi-3.0.18-r5.ebuild 3239 BLAKE2B b82b6cdcd7477e82f73398728617b03fba8ebff8b8e7c57a3add84d6fbcb4803fa5d12ccc547f949519a3d056c8d2a7d9a3e7670d96aff10f760d5c620413761 SHA512 11ca3ef251cdbcdd02e1ba904c31ce76409289e69382396ff600502ca5e5987fc8f8512eb718eaae59479c263647d0798c669cf5939cae4ca7c772fa7425bd3f +EBUILD gnu-efi-3.0.18-r3.ebuild 3064 BLAKE2B 9a15bbc0c10083d1c9f5c950502ed82e6b7eb2bac71008aae6a0847923a182f907e13c1520b6ad6b9ca9ce5d1aeb8011feb6167fa6fb08e00af395ea93d2b00e SHA512 2394f30300bc44785a52361fe90478b29922898a9b7703955e9e6359bf71bc762ca9c9d55af1ba33b435ea1d861974929aa46216655e9990664800f5fabafca1 +EBUILD gnu-efi-3.0.18-r5.ebuild 3840 BLAKE2B 150304dcbc7715218e971d883ac46d759bef33b98181f22c789ce53fa3fb568297119d0a59e2663e3210982290b6210aa703cf9b5634d5c886f17938f0840a2c SHA512 bddcd08007c4b08d7dea00dad75757a90d2773578ef66d0a8edc5c7380521a57092ef7fb8c198a2a49c6966f7572283f5fd4dbf9d30e62e67170a82c3a808c46 MISC metadata.xml 381 BLAKE2B a3cbadc2ae97d29ac87c04f3209cd7f4879ef70903907f319b425f038f07fd6bbc357a0291e70909a3b0b2097de6b63daf0f568d0fd7097c7bd2d9c9c7f3a963 SHA512 abbdda69a47f94442977af7491596e40873767256f5e75c3c06b614a369ec8cb7103a132e77a95c99ba24e4b205e5c3fc267039c920c1268a19b17e4ac779b79 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 '\<pei-' && return 0 + # If OBJCOPY does not support EFI targets, it is possible that the 'objcopy' on our path is + # still LLVM if the 'binutils-plugin' USE flag is set. In this case, we check to see if the + # '(prefix)/usr/bin/objcopy' binary is available (it should be, it's a dependency), and if + # so, we use the absolute path explicitly. + local binutils_objcopy="${EPREFIX}"/usr/bin/"${OBJCOPY}" + if [[ -e "${binutils_objcopy}" ]]; then + OBJCOPY="${binutils_objcopy}" + fi LANG=C LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target" fi } diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild index adfad0c0f98e..d3d5d12d57b7 100644 --- a/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.ebuild +++ b/sys-boot/gnu-efi/gnu-efi-3.0.18-r5.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 '\<pei-' && return 0 + # If OBJCOPY does not support EFI targets, it is possible that the 'objcopy' on our path is + # still LLVM if the 'binutils-plugin' USE flag is set. In this case, we check to see if the + # '(prefix)/usr/bin/objcopy' binary is available (it should be, it's a dependency), and if + # so, we use the absolute path explicitly. + local binutils_objcopy="${EPREFIX}"/usr/bin/"${OBJCOPY}" + if [[ -e "${binutils_objcopy}" ]]; then + OBJCOPY="${binutils_objcopy}" + fi if ! use arm && ! use riscv; then # bug #939338 # objcopy does not understand PE/COFF on these arches: arm32, riscv64 and mips64le |