1 |
jer 10/02/18 18:27:53 |
2 |
|
3 |
Modified: ChangeLog syslinux-3.84.ebuild |
4 |
Log: |
5 |
Switch to IUSE=custom-cflags (bug #305783). |
6 |
(Portage version: 2.2_rc62/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.52 sys-boot/syslinux/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/ChangeLog?rev=1.52&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/ChangeLog?rev=1.52&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/ChangeLog?r1=1.51&r2=1.52 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v |
18 |
retrieving revision 1.51 |
19 |
retrieving revision 1.52 |
20 |
diff -u -r1.51 -r1.52 |
21 |
--- ChangeLog 18 Feb 2010 17:40:22 -0000 1.51 |
22 |
+++ ChangeLog 18 Feb 2010 18:27:52 -0000 1.52 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for sys-boot/syslinux |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.51 2010/02/18 17:40:22 jer Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/ChangeLog,v 1.52 2010/02/18 18:27:52 jer Exp $ |
28 |
+ |
29 |
+ 18 Feb 2010; Jeroen Roovers <jer@g.o> syslinux-3.84.ebuild: |
30 |
+ Switch to IUSE=custom-cflags (bug #305783). |
31 |
|
32 |
18 Feb 2010; Jeroen Roovers <jer@g.o> syslinux-3.84.ebuild: |
33 |
Respect CFLAGS, LDFLAGS, CC. |
34 |
|
35 |
|
36 |
|
37 |
1.3 sys-boot/syslinux/syslinux-3.84.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild?rev=1.3&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild?rev=1.3&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild?r1=1.2&r2=1.3 |
42 |
|
43 |
Index: syslinux-3.84.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild,v |
46 |
retrieving revision 1.2 |
47 |
retrieving revision 1.3 |
48 |
diff -u -r1.2 -r1.3 |
49 |
--- syslinux-3.84.ebuild 18 Feb 2010 17:40:22 -0000 1.2 |
50 |
+++ syslinux-3.84.ebuild 18 Feb 2010 18:27:52 -0000 1.3 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2010 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild,v 1.2 2010/02/18 17:40:22 jer Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/syslinux/syslinux-3.84.ebuild,v 1.3 2010/02/18 18:27:52 jer Exp $ |
56 |
|
57 |
inherit eutils toolchain-funcs |
58 |
|
59 |
@@ -11,7 +11,7 @@ |
60 |
LICENSE="GPL-2" |
61 |
SLOT="0" |
62 |
KEYWORDS="-* ~amd64 ~x86" |
63 |
-IUSE="" |
64 |
+IUSE="custom-cflags" |
65 |
|
66 |
RDEPEND="sys-fs/mtools |
67 |
dev-perl/Crypt-PasswdMD5 |
68 |
@@ -34,16 +34,18 @@ |
69 |
|
70 |
rm -f gethostip #bug 137081 |
71 |
|
72 |
- sed -i \ |
73 |
- extlinux/Makefile \ |
74 |
- linux/Makefile \ |
75 |
- mtools/Makefile \ |
76 |
- sample/Makefile \ |
77 |
- utils/Makefile \ |
78 |
- -e '/^LDFLAGS/d' \ |
79 |
- -e 's|-Os||g' \ |
80 |
- -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \ |
81 |
- || die "sed failed" |
82 |
+ local SYSLINUX_MAKEFILES="extlinux/Makefile linux/Makefile mtools/Makefile \ |
83 |
+ sample/Makefile utils/Makefile" |
84 |
+ sed -i ${SYSLINUX_MAKEFILES} -e '/^LDFLAGS/d' || die "sed failed" |
85 |
+ |
86 |
+ if use custom-cflags; then |
87 |
+ sed -i ${SYSLINUX_MAKEFILES} \ |
88 |
+ -e 's|-g -Os||g' \ |
89 |
+ -e 's|-Os||g' \ |
90 |
+ -e 's|CFLAGS[[:space:]]\+=|CFLAGS +=|g' \ |
91 |
+ || die "sed custom-cflags failed" |
92 |
+ fi |
93 |
+ |
94 |
} |
95 |
|
96 |
src_compile() { |