summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2014-06-28 15:46:47 +0000
committerRaúl Porcel <armin76@gentoo.org>2014-06-28 15:46:47 +0000
commitf5302473e9f32e94aa6639a6b4b7e5e03ba97a14 (patch)
tree5a3f50c729647c83a4e2352a07a6b61fba8b2785 /sys-boot
parentdrop py2.6 py3.2 pypy2_0 add py3.4, add missing dep, patch submitted by fau, ... (diff)
downloadhistorical-f5302473e9f32e94aa6639a6b4b7e5e03ba97a14.tar.gz
historical-f5302473e9f32e94aa6639a6b4b7e5e03ba97a14.tar.bz2
historical-f5302473e9f32e94aa6639a6b4b7e5e03ba97a14.zip
Add the fix from 3.0u to 3.0s since its stable, bug #503210
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0xF6AD3240
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/gnu-efi/ChangeLog5
-rw-r--r--sys-boot/gnu-efi/Manifest20
-rw-r--r--sys-boot/gnu-efi/gnu-efi-3.0s.ebuild10
3 files changed, 17 insertions, 18 deletions
diff --git a/sys-boot/gnu-efi/ChangeLog b/sys-boot/gnu-efi/ChangeLog
index 80fe441c332d..37c9046dd905 100644
--- a/sys-boot/gnu-efi/ChangeLog
+++ b/sys-boot/gnu-efi/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-boot/gnu-efi
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/ChangeLog,v 1.24 2014/03/15 19:56:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/ChangeLog,v 1.25 2014/06/28 15:46:39 armin76 Exp $
+
+ 28 Jun 2014; Raúl Porcel <armin76@gentoo.org> gnu-efi-3.0s.ebuild:
+ Add the fix from 3.0u to 3.0s since its stable, bug #503210
15 Mar 2014; Mike Frysinger <vapier@gentoo.org> gnu-efi-3.0u.ebuild:
Avoid -maccumulate-outgoing-args on ia64 systems #503210 by Dennis Schridde.
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index 87c03d45b7b9..666365c5c931 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -13,24 +13,14 @@ DIST gnu-efi_3.0u.orig.tar.gz 159662 SHA256 3c0d450d5829204ca05dcb3b2aae772e52c3
EBUILD gnu-efi-3.0a-r1.ebuild 910 SHA256 63de65c337180c22148ba900ab84887e24830d57981e1497d50c1163b5ed0fcc SHA512 af742968eb912f305bfa8c60022245b81d35943d45fa0d40260c49e402922ae5b4f8e795465fb7b8f3cb29a3b3b45f8a2404adfd11c2771ed304712487490101 WHIRLPOOL d93dcc736194f09b786f0c5eb9f95c63d455a542fd5a5225c657d324317c86f56703e38ad4055d09cf4bf586d9bf8c4e4c2e6e2b3b992892ef7d9a15802834c0
EBUILD gnu-efi-3.0g.ebuild 887 SHA256 0a42051d1ec1d5149423ef7b444484f35bd7c9705363e52c57332424a2ba4ed3 SHA512 d01f6814359155a48ae104f1b07080114b3653cfcd2114b1f3dcda2140a421b8efb13a40effef926efacc4b8c29502289ce5e18a373b9135d18efe8a5a5471ce WHIRLPOOL 1307ae0642f1a2641c184b713c43044991d362d96f8eb442facf4c2110432c5241e2ff4298b2ecef9f00b1c55aa452d4fd28b3b4e5cde892535e938857bba2b4
EBUILD gnu-efi-3.0i.ebuild 1051 SHA256 8a5be77766c87ed07cb7962864a4351e0e00a73678b9f85db5722f78b729928b SHA512 2db8cb512834a5bcd62e4c60d974b69d7c8068802a96c8f5d80ccbc3a34ad776e993b4a6def453db83e6f4f3be4617486cf983d76b898028c26140bb0b88bc7c WHIRLPOOL 6da5fc9cdc24d0c485b103fe8b442acbeadf743e1375e67cceeaf5ad251bc3ff7754d38677e415d42faf4c2dbf670794fe20fff9b2c17357de42a21000e19b6b
-EBUILD gnu-efi-3.0s.ebuild 1360 SHA256 2cfa9cc3051b2e3b0fc99306d506fcf449128909426e969607a7e96af454c12f SHA512 2f69d2eba73d6df5cef74a4e51b90dbad8f3b92397b3046288c6938837997d406c009d4341621db14ea0fc4216540e86027416a9a24bca9921932bcf6852892f WHIRLPOOL 495e44bb0b77b85edb292bc749f885209d1c93ec1ab0cade007bc5dbf1ece412b9be1cb41b5243a75477edf859939421f626376d99ea1ff5e69eb982c7b210df
+EBUILD gnu-efi-3.0s.ebuild 1499 SHA256 f083d9ee6c5c726181856bcd84f9e35c6441caa6829a3e5a2f424b4c2d12942b SHA512 9c9c8bc300a5100b8990ff84497606381b1879a877a5971985d655270e5f79ddf861b2e94cf3c4a176b24b3de7df72f74ddfed77a8b8bc6e12bc3127fa12e354 WHIRLPOOL 8e0e69b3b4f02d3fdb5ab5a0ff6d628fa01c95bcb5114db52161b4e29730a5249aa38653099e2cfcf1e3adea9d4602ba04eac30aa72bdaf68fa8333e6ae6ee82
EBUILD gnu-efi-3.0u.ebuild 1419 SHA256 ce26981cf8cbf181c712e70ebc04f96425e9fa8e0f1ceeb32a131001859de7e7 SHA512 78237ab358c86019ebdcf36667626d3a91e2bade8de26b1d15935b2ced2182f1896e21bba0940d269969c6fa107e17dddfa2214dcc79dec6bdd975abc079a9cb WHIRLPOOL a82142a4757ce8de93e9850dd50a905323aaea62ba254f674d2399b81dbc71241439155a5a964bf5c057fe07845cad0993b56f95646f5a8db8e1f9305bdb54a5
-MISC ChangeLog 3254 SHA256 4c896bd5bb8eaa3edf76005ade1cca812788f777574789255c3531759e9baa1c SHA512 ec10096c13402bfa8876959d585120fc92015cc1a904a9fbb4412e5789799fb36c654d4e14f52e6077d38c6a4081613e284ca57a4b0fc7edaa0a24060a59c03d WHIRLPOOL 70e96bc44ce51bbd3105a5a6e1251f7b69e83edaa5428139823e4d2d6429f628e9881481647698c8e68d695bc8b583e0c1181732be033ab53caba791095c8e51
+MISC ChangeLog 3388 SHA256 a5b33e3361094afe8c792494e8c0ff565923791b2e872c1a8af0076e8d162596 SHA512 4ccdc39ea67ba4f427c05ffd1281401aece332a54fdd1ce3c063272a4d54b05019765353fc5e21d34b5d4b25215424e1c747af4eeb96df6c758c45be72ee6f35 WHIRLPOOL 380b981a7b97b8e23a22c7013358f33e85d7f18c50751d4fec2287e61f39b5efbdd49fb041294c9e731077493542e2350bae863b4e1323037a4a1781dde390c7
MISC metadata.xml 157 SHA256 7e261fbe78f2088ab2a27fe3bd23a4224dde9a11031edcb4b7bb95dd3ba1fe4a SHA512 0d0a45c88d8f80bd12c6f182387db789e11fb77de5f17f6896e638d1f57be0e207f8a0bdb63c4cbf570d30fb9d4d9928374bddd26bd035dd13485779158e078f WHIRLPOOL 431702b09d79742c3946fca1ee4adc8c7dc7bc1f35b8baa9db077208d540808a9dd774077e268a18b72cbe97305165b599a2cb4553f514691697da7f2251418b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQIcBAEBCAAGBQJTJLBtAAoJEPGu1DbS6WIADq0QAIEjdN/fd1Cl3p+TPKhTuIuI
-eJJRULbpVzRIb/2gbP//OnfJ2KpqEnxqHSsDS1RAC8aPDx9z1MkmCgCsT3bvKDqF
-OudZikfDmxOHjiP/Svu0bRRx8Ld/HxXwgb0j6LSQIV3rIw+20sy5/wx7l2A9qlJx
-NfqS+BjFGC6+bKUoEdReTS0pBPTO1KCLg28VOdH1Ygg1ZD+hTe4xUUBLEpOd1x6n
-U1qz+gImEr5nHiORGs7zuFcCCxOqHfOTm7lzICLdEvX/e4wIBv5nUUBmfzZ7vrwd
-rtGmb2hOk7t8jjnAaJGuMEdIutIZwBda2ji7aaGCHk+mEiohRI8DMOg4f8wRoNQH
-5zIVPLlNzCxzu79x9075+IJhSXvBhugzIElbnYOVkdNXVfTPUIKXzix00qchrdlh
-SuhMF5SIUs7VkDvBRi2q9Fi8kmD0tiLHz85xQtlwPclaVt7p2hDMtcKrIqLQPng2
-fALCJnMJxlaN6Yj8N27S558KhcXZQwnGqmHqzNtEViIFyv/k/iakepmAtL2f4T4L
-pKOFu7iRjyfqAV8/EZuAoxkViZnkAGyE94frkzpQVw2zsAPgz4ZSW3ABVOFL+H4T
-1OYk5fSDeox38YMgYJaHHorkMUuH4lwB5I1WwGmk5XQ4S7AYgmvyUq8owJGnFf1U
-QNwqymYpLkETaga+eQkO
-=0mZM
+iEYEAREIAAYFAlOu418ACgkQuQc30/atMkC7ogCgsPCkdumQlt6wda85JwBnWJbv
+GmIAn2j7MqWKyPbUgnykqi87icbrRG8H
+=EHqW
-----END PGP SIGNATURE-----
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0s.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0s.ebuild
index 2c60b2c6c1ba..b443389c41df 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0s.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0s.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0s.ebuild,v 1.4 2013/07/07 15:19:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0s.ebuild,v 1.5 2014/06/28 15:46:39 armin76 Exp $
EAPI="4"
@@ -30,6 +30,12 @@ QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
src_prepare() {
EPATCH_OPTS="-p1" epatch "${WORKDIR}"/*.diff
sed -i -e '/^CFLAGS/s:$: -fno-stack-protector:' Make.defaults || die #444246
+ if ! use amd64 && ! use x86 ; then
+ sed -i \
+ -e '/CPPFLAGS/s:-maccumulate-outgoing-args::' \
+ Make.defaults || die #503210
+ fi
+
}
_emake() {