Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/squashfs-tools: squashfs-tools-3.2_p2.ebuild ChangeLog squashfs-tools-3.1_p2.ebuild squashfs-tools-3.3.ebuild squashfs-tools-3.4.ebuild
Date: Wed, 15 Oct 2008 03:05:22
Message-Id: E1KpwhL-0000t8-8v@stork.gentoo.org
1 jer 08/10/15 03:05:19
2
3 Modified: squashfs-tools-3.2_p2.ebuild ChangeLog
4 squashfs-tools-3.1_p2.ebuild
5 squashfs-tools-3.3.ebuild squashfs-tools-3.4.ebuild
6 Log:
7 Pick up CFLAGS from the environment instead of "setting them in stone" (bug #242030).
8 (Portage version: 2.2_rc12/cvs/Linux 2.6.25-gentoo-r7-JeR i686)
9
10 Revision Changes Path
11 1.4 sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild?rev=1.4&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild?rev=1.4&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild?r1=1.3&r2=1.4
16
17 Index: squashfs-tools-3.2_p2.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild,v
20 retrieving revision 1.3
21 retrieving revision 1.4
22 diff -u -r1.3 -r1.4
23 --- squashfs-tools-3.2_p2.ebuild 28 Jun 2008 09:13:48 -0000 1.3
24 +++ squashfs-tools-3.2_p2.ebuild 15 Oct 2008 03:05:19 -0000 1.4
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2008 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild,v 1.3 2008/06/28 09:13:48 wolf31o2 Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.2_p2.ebuild,v 1.4 2008/10/15 03:05:19 jer Exp $
30
31 inherit toolchain-funcs
32
33 @@ -21,7 +21,7 @@
34 src_unpack() {
35 unpack ${A}
36 cd "${S}"
37 - sed -i "s:-O2:${CFLAGS}:" Makefile
38 + sed -i 's:-O2:$(CFLAGS):' Makefile
39 }
40
41 src_compile() {
42
43
44
45 1.57 sys-fs/squashfs-tools/ChangeLog
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/ChangeLog?rev=1.57&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/ChangeLog?rev=1.57&content-type=text/plain
49 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/ChangeLog?r1=1.56&r2=1.57
50
51 Index: ChangeLog
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v
54 retrieving revision 1.56
55 retrieving revision 1.57
56 diff -u -r1.56 -r1.57
57 --- ChangeLog 28 Aug 2008 03:36:00 -0000 1.56
58 +++ ChangeLog 15 Oct 2008 03:05:19 -0000 1.57
59 @@ -1,6 +1,12 @@
60 # ChangeLog for sys-fs/squashfs-tools
61 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
62 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.56 2008/08/28 03:36:00 jer Exp $
63 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.57 2008/10/15 03:05:19 jer Exp $
64 +
65 + 15 Oct 2008; Jeroen Roovers <jer@g.o> squashfs-tools-3.1_p2.ebuild,
66 + squashfs-tools-3.2_p2.ebuild, squashfs-tools-3.3.ebuild,
67 + squashfs-tools-3.4.ebuild:
68 + Pick up CFLAGS from the environment instead of "setting them in stone"
69 + (bug #242030).
70
71 *squashfs-tools-3.4 (28 Aug 2008)
72
73
74
75
76 1.12 sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild
77
78 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild?rev=1.12&view=markup
79 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild?rev=1.12&content-type=text/plain
80 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild?r1=1.11&r2=1.12
81
82 Index: squashfs-tools-3.1_p2.ebuild
83 ===================================================================
84 RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild,v
85 retrieving revision 1.11
86 retrieving revision 1.12
87 diff -u -r1.11 -r1.12
88 --- squashfs-tools-3.1_p2.ebuild 15 May 2007 15:13:11 -0000 1.11
89 +++ squashfs-tools-3.1_p2.ebuild 15 Oct 2008 03:05:19 -0000 1.12
90 @@ -1,6 +1,6 @@
91 -# Copyright 1999-2007 Gentoo Foundation
92 +# Copyright 1999-2008 Gentoo Foundation
93 # Distributed under the terms of the GNU General Public License v2
94 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild,v 1.11 2007/05/15 15:13:11 jer Exp $
95 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.1_p2.ebuild,v 1.12 2008/10/15 03:05:19 jer Exp $
96
97 inherit toolchain-funcs
98
99 @@ -21,7 +21,7 @@
100 src_unpack() {
101 unpack ${A}
102 cd "${S}"
103 - sed -i "s:-O2:${CFLAGS}:" Makefile
104 + sed -i 's:-O2:$(CFLAGS):' Makefile
105 }
106
107 src_compile() {
108
109
110
111 1.5 sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild
112
113 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild?rev=1.5&view=markup
114 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild?rev=1.5&content-type=text/plain
115 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild?r1=1.4&r2=1.5
116
117 Index: squashfs-tools-3.3.ebuild
118 ===================================================================
119 RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild,v
120 retrieving revision 1.4
121 retrieving revision 1.5
122 diff -u -r1.4 -r1.5
123 --- squashfs-tools-3.3.ebuild 28 Jun 2008 09:13:48 -0000 1.4
124 +++ squashfs-tools-3.3.ebuild 15 Oct 2008 03:05:19 -0000 1.5
125 @@ -1,6 +1,6 @@
126 # Copyright 1999-2008 Gentoo Foundation
127 # Distributed under the terms of the GNU General Public License v2
128 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild,v 1.4 2008/06/28 09:13:48 wolf31o2 Exp $
129 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.3.ebuild,v 1.5 2008/10/15 03:05:19 jer Exp $
130
131 inherit eutils toolchain-funcs
132
133 @@ -21,7 +21,7 @@
134 src_unpack() {
135 unpack ${A}
136 cd "${S}"
137 - sed -i "s:-O2:${CFLAGS}:" Makefile
138 + sed -i 's:-O2:$(CFLAGS):' Makefile
139 epatch "${FILESDIR}"/squashfs-tools-3.3-posix.patch || die patching failed
140 }
141
142
143
144
145 1.2 sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild
146
147 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild?rev=1.2&view=markup
148 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild?rev=1.2&content-type=text/plain
149 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild?r1=1.1&r2=1.2
150
151 Index: squashfs-tools-3.4.ebuild
152 ===================================================================
153 RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild,v
154 retrieving revision 1.1
155 retrieving revision 1.2
156 diff -u -r1.1 -r1.2
157 --- squashfs-tools-3.4.ebuild 28 Aug 2008 03:36:00 -0000 1.1
158 +++ squashfs-tools-3.4.ebuild 15 Oct 2008 03:05:19 -0000 1.2
159 @@ -1,6 +1,6 @@
160 # Copyright 1999-2008 Gentoo Foundation
161 # Distributed under the terms of the GNU General Public License v2
162 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild,v 1.1 2008/08/28 03:36:00 jer Exp $
163 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-3.4.ebuild,v 1.2 2008/10/15 03:05:19 jer Exp $
164
165 inherit toolchain-funcs
166
167 @@ -22,8 +22,8 @@
168 unpack ${A}
169 cd "${S}"
170 sed -i \
171 - -e "s:-O2:${CFLAGS}:" \
172 - -e 's:$(CC):$(CC) ${LDFLAGS}:' \
173 + -e 's:-O2:$(CFLAGS):' \
174 + -e 's:$(CC):$(CC) $(LDFLAGS):' \
175 Makefile || die "sed failed"
176 }