[gentoo-commits] gentoo-x86 commit in sys-boot/gnu-efi: ChangeLog gnu-efi-3.0s.ebuild

[gentoo-commits] gentoo-x86 commit in sys-boot/gnu-efi: ChangeLog gnu-efi-3.0s.ebuild

[Raul Porcel (armin76)]

armin76     14/06/28 15:46:40

  Modified:             ChangeLog gnu-efi-3.0s.ebuild
  Log:
  Add the fix from 3.0u to 3.0s since its stable, bug #503210
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xF6AD3240)

Revision  Changes    Path
1.25                 sys-boot/gnu-efi/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/gnu-efi/ChangeLog?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/gnu-efi/ChangeLog?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/gnu-efi/ChangeLog?r1=1.24&r2=1.25

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog	15 Mar 2014 19:56:24 -0000	1.24
+++ ChangeLog	28 Jun 2014 15:46:39 -0000	1.25
@@ -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.



1.5                  sys-boot/gnu-efi/gnu-efi-3.0s.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0s.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0s.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0s.ebuild?r1=1.4&r2=1.5

Index: gnu-efi-3.0s.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/gnu-efi/gnu-efi-3.0s.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnu-efi-3.0s.ebuild	7 Jul 2013 15:19:32 -0000	1.4
+++ gnu-efi-3.0s.ebuild	28 Jun 2014 15:46:39 -0000	1.5
@@ -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 @@
 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() {