| 1 |
floppym 12/07/01 22:11:05 |
| 2 |
|
| 3 |
Modified: grub-9999.ebuild grub-2.00.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Unset CCASFLAGS. Reported by tommy. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha114/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.76 sys-boot/grub/grub-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.76&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.76&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.75&r2=1.76 |
| 15 |
|
| 16 |
Index: grub-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v |
| 19 |
retrieving revision 1.75 |
| 20 |
retrieving revision 1.76 |
| 21 |
diff -u -r1.75 -r1.76 |
| 22 |
--- grub-9999.ebuild 1 Jul 2012 21:31:16 -0000 1.75 |
| 23 |
+++ grub-9999.ebuild 1 Jul 2012 22:11:04 -0000 1.76 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.75 2012/07/01 21:31:16 floppym Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.76 2012/07/01 22:11:04 floppym Exp $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
@@ -209,7 +209,9 @@ |
| 33 |
src_prepare() { |
| 34 |
local i j |
| 35 |
|
| 36 |
- epatch "${FILESDIR}/${P}-manpage-race.patch" |
| 37 |
+ if [[ ${PV} != 9999 ]]; then |
| 38 |
+ epatch "${FILESDIR}/${P}-manpage-race.patch" |
| 39 |
+ fi |
| 40 |
|
| 41 |
# fix texinfo file name, bug 416035 |
| 42 |
sed -i \ |
| 43 |
@@ -245,7 +247,7 @@ |
| 44 |
src_configure() { |
| 45 |
local i |
| 46 |
|
| 47 |
- use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS |
| 48 |
+ use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS |
| 49 |
use static && append-ldflags -static |
| 50 |
|
| 51 |
# Sandbox bug 404013. |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.10 sys-boot/grub/grub-2.00.ebuild |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.10&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?rev=1.10&content-type=text/plain |
| 59 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.00.ebuild?r1=1.9&r2=1.10 |
| 60 |
|
| 61 |
Index: grub-2.00.ebuild |
| 62 |
=================================================================== |
| 63 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v |
| 64 |
retrieving revision 1.9 |
| 65 |
retrieving revision 1.10 |
| 66 |
diff -u -r1.9 -r1.10 |
| 67 |
--- grub-2.00.ebuild 1 Jul 2012 21:31:16 -0000 1.9 |
| 68 |
+++ grub-2.00.ebuild 1 Jul 2012 22:11:04 -0000 1.10 |
| 69 |
@@ -1,6 +1,6 @@ |
| 70 |
# Copyright 1999-2012 Gentoo Foundation |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.9 2012/07/01 21:31:16 floppym Exp $ |
| 73 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00.ebuild,v 1.10 2012/07/01 22:11:04 floppym Exp $ |
| 74 |
|
| 75 |
EAPI=4 |
| 76 |
|
| 77 |
@@ -209,7 +209,9 @@ |
| 78 |
src_prepare() { |
| 79 |
local i j |
| 80 |
|
| 81 |
- epatch "${FILESDIR}/${P}-manpage-race.patch" |
| 82 |
+ if [[ ${PV} != 9999 ]]; then |
| 83 |
+ epatch "${FILESDIR}/${P}-manpage-race.patch" |
| 84 |
+ fi |
| 85 |
|
| 86 |
# fix texinfo file name, bug 416035 |
| 87 |
sed -i \ |
| 88 |
@@ -245,7 +247,7 @@ |
| 89 |
src_configure() { |
| 90 |
local i |
| 91 |
|
| 92 |
- use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS |
| 93 |
+ use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS |
| 94 |
use static && append-ldflags -static |
| 95 |
|
| 96 |
# Sandbox bug 404013. |
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
1.225 sys-boot/grub/ChangeLog |
| 101 |
|
| 102 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.225&view=markup |
| 103 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.225&content-type=text/plain |
| 104 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.224&r2=1.225 |
| 105 |
|
| 106 |
Index: ChangeLog |
| 107 |
=================================================================== |
| 108 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v |
| 109 |
retrieving revision 1.224 |
| 110 |
retrieving revision 1.225 |
| 111 |
diff -u -r1.224 -r1.225 |
| 112 |
--- ChangeLog 1 Jul 2012 21:31:16 -0000 1.224 |
| 113 |
+++ ChangeLog 1 Jul 2012 22:11:04 -0000 1.225 |
| 114 |
@@ -1,6 +1,10 @@ |
| 115 |
# ChangeLog for sys-boot/grub |
| 116 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 117 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.224 2012/07/01 21:31:16 floppym Exp $ |
| 118 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.225 2012/07/01 22:11:04 floppym Exp $ |
| 119 |
+ |
| 120 |
+ 01 Jul 2012; Mike Gilbert <floppym@g.o> grub-2.00.ebuild, |
| 121 |
+ grub-9999.ebuild: |
| 122 |
+ Unset CCASFLAGS. Reported by tommy. |
| 123 |
|
| 124 |
01 Jul 2012; Mike Gilbert <floppym@g.o> |
| 125 |
+files/grub-2.00-manpage-race.patch, |
Archives