1 |
vapier 08/11/01 07:33:10 |
2 |
|
3 |
Modified: uclibc-0.9.28.3-r3.ebuild uclibc-0.9.30_rc3.ebuild |
4 |
uclibc-0.9.28.3-r7.ebuild ChangeLog |
5 |
uclibc-0.9.28.3.ebuild uclibc-0.9.28.3-r6.ebuild |
6 |
uclibc-0.9.30_rc1.ebuild uclibc-0.9.27-r1.ebuild |
7 |
Log: |
8 |
Unify some ebuild differences and fix header-only install with newer versions #234748 by Nathan Brink. |
9 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.26.2 x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.4 sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild?rev=1.4&view=markup |
15 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild?rev=1.4&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild?r1=1.3&r2=1.4 |
17 |
|
18 |
Index: uclibc-0.9.28.3-r3.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild,v |
21 |
retrieving revision 1.3 |
22 |
retrieving revision 1.4 |
23 |
diff -u -r1.3 -r1.4 |
24 |
--- uclibc-0.9.28.3-r3.ebuild 27 Oct 2008 06:53:14 -0000 1.3 |
25 |
+++ uclibc-0.9.28.3-r3.ebuild 1 Nov 2008 07:33:09 -0000 1.4 |
26 |
@@ -1,6 +1,6 @@ |
27 |
# Copyright 1999-2008 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild,v 1.3 2008/10/27 06:53:14 vapier Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r3.ebuild,v 1.4 2008/11/01 07:33:09 vapier Exp $ |
31 |
|
32 |
#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" |
33 |
#inherit subversion |
34 |
@@ -424,25 +424,25 @@ |
35 |
# system headers correctly. See gcc/doc/gccinstall.info |
36 |
if [[ ${CTARGET} != ${CHOST} ]] ; then |
37 |
dosym usr/include /usr/${CTARGET}/sys-include |
38 |
- newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
39 |
- newbin utils/ldd.host ${CTARGET}-ldd || die |
40 |
+ if ! just_headers ; then |
41 |
+ newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
42 |
+ newbin utils/ldd.host ${CTARGET}-ldd || die |
43 |
+ fi |
44 |
return 0 |
45 |
fi |
46 |
|
47 |
- if [[ ${CHOST} == *-uclibc ]] ; then |
48 |
- make DESTDIR="${D}" install_utils || die "install-utils failed" |
49 |
+ if [[ ${CHOST} == *-uclibc* ]] ; then |
50 |
+ emake DESTDIR="${D}" install_utils || die "install-utils failed" |
51 |
dobin extra/scripts/getent |
52 |
fi |
53 |
|
54 |
- if ! use build ; then |
55 |
- dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
56 |
- doman docs/man/*.[1-9] |
57 |
- fi |
58 |
+ dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
59 |
+ doman docs/man/*.[1-9] |
60 |
} |
61 |
|
62 |
pkg_postinst() { |
63 |
[[ ${CTARGET} != ${CHOST} ]] && return 0 |
64 |
- [[ ${CHOST} != *-uclibc ]] && return 0 |
65 |
+ [[ ${CHOST} != *-uclibc* ]] && return 0 |
66 |
|
67 |
if [[ ! -e ${ROOT}/etc/TZ ]] ; then |
68 |
ewarn "Please remember to set your timezone in /etc/TZ" |
69 |
|
70 |
|
71 |
|
72 |
1.2 sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild |
73 |
|
74 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild?rev=1.2&view=markup |
75 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild?rev=1.2&content-type=text/plain |
76 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild?r1=1.1&r2=1.2 |
77 |
|
78 |
Index: uclibc-0.9.30_rc3.ebuild |
79 |
=================================================================== |
80 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild,v |
81 |
retrieving revision 1.1 |
82 |
retrieving revision 1.2 |
83 |
diff -u -r1.1 -r1.2 |
84 |
--- uclibc-0.9.30_rc3.ebuild 29 Oct 2008 15:35:58 -0000 1.1 |
85 |
+++ uclibc-0.9.30_rc3.ebuild 1 Nov 2008 07:33:09 -0000 1.2 |
86 |
@@ -1,6 +1,6 @@ |
87 |
# Copyright 1999-2008 Gentoo Foundation |
88 |
# Distributed under the terms of the GNU General Public License v2 |
89 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild,v 1.1 2008/10/29 15:35:58 solar Exp $ |
90 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc3.ebuild,v 1.2 2008/11/01 07:33:09 vapier Exp $ |
91 |
|
92 |
#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" |
93 |
#inherit subversion |
94 |
@@ -424,8 +424,6 @@ |
95 |
just_headers && target="install_headers" |
96 |
emake DESTDIR="${sysroot}" ${target} || die "install failed" |
97 |
|
98 |
- just_headers && return 0 |
99 |
- |
100 |
save_config .config |
101 |
|
102 |
# remove files coming from kernel-headers |
103 |
@@ -436,20 +434,20 @@ |
104 |
# system headers correctly. See gcc/doc/gccinstall.info |
105 |
if [[ ${CTARGET} != ${CHOST} ]] ; then |
106 |
dosym usr/include /usr/${CTARGET}/sys-include |
107 |
- newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
108 |
- newbin utils/ldd.host ${CTARGET}-ldd || die |
109 |
+ if ! just_headers ; then |
110 |
+ newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
111 |
+ newbin utils/ldd.host ${CTARGET}-ldd || die |
112 |
+ fi |
113 |
return 0 |
114 |
fi |
115 |
|
116 |
if [[ ${CHOST} == *-uclibc* ]] ; then |
117 |
- make DESTDIR="${D}" install_utils || die "install-utils failed" |
118 |
+ emake DESTDIR="${D}" install_utils || die "install-utils failed" |
119 |
dobin extra/scripts/getent |
120 |
fi |
121 |
|
122 |
- if ! use build ; then |
123 |
- dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
124 |
- doman docs/man/*.[1-9] |
125 |
- fi |
126 |
+ dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
127 |
+ doman docs/man/*.[1-9] |
128 |
} |
129 |
|
130 |
pkg_postinst() { |
131 |
|
132 |
|
133 |
|
134 |
1.3 sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild |
135 |
|
136 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild?rev=1.3&view=markup |
137 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild?rev=1.3&content-type=text/plain |
138 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild?r1=1.2&r2=1.3 |
139 |
|
140 |
Index: uclibc-0.9.28.3-r7.ebuild |
141 |
=================================================================== |
142 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild,v |
143 |
retrieving revision 1.2 |
144 |
retrieving revision 1.3 |
145 |
diff -u -r1.2 -r1.3 |
146 |
--- uclibc-0.9.28.3-r7.ebuild 27 Oct 2008 06:53:14 -0000 1.2 |
147 |
+++ uclibc-0.9.28.3-r7.ebuild 1 Nov 2008 07:33:09 -0000 1.3 |
148 |
@@ -1,6 +1,6 @@ |
149 |
# Copyright 1999-2008 Gentoo Foundation |
150 |
# Distributed under the terms of the GNU General Public License v2 |
151 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild,v 1.2 2008/10/27 06:53:14 vapier Exp $ |
152 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r7.ebuild,v 1.3 2008/11/01 07:33:09 vapier Exp $ |
153 |
|
154 |
#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" |
155 |
#inherit subversion |
156 |
@@ -424,25 +424,25 @@ |
157 |
# system headers correctly. See gcc/doc/gccinstall.info |
158 |
if [[ ${CTARGET} != ${CHOST} ]] ; then |
159 |
dosym usr/include /usr/${CTARGET}/sys-include |
160 |
- newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
161 |
- newbin utils/ldd.host ${CTARGET}-ldd || die |
162 |
+ if ! just_headers ; then |
163 |
+ newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
164 |
+ newbin utils/ldd.host ${CTARGET}-ldd || die |
165 |
+ fi |
166 |
return 0 |
167 |
fi |
168 |
|
169 |
- if [[ ${CHOST} == *-uclibc ]] ; then |
170 |
- make DESTDIR="${D}" install_utils || die "install-utils failed" |
171 |
+ if [[ ${CHOST} == *-uclibc* ]] ; then |
172 |
+ emake DESTDIR="${D}" install_utils || die "install-utils failed" |
173 |
dobin extra/scripts/getent |
174 |
fi |
175 |
|
176 |
- if ! use build ; then |
177 |
- dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
178 |
- doman docs/man/*.[1-9] |
179 |
- fi |
180 |
+ dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
181 |
+ doman docs/man/*.[1-9] |
182 |
} |
183 |
|
184 |
pkg_postinst() { |
185 |
[[ ${CTARGET} != ${CHOST} ]] && return 0 |
186 |
- [[ ${CHOST} != *-uclibc ]] && return 0 |
187 |
+ [[ ${CHOST} != *-uclibc* ]] && return 0 |
188 |
|
189 |
if [[ ! -e ${ROOT}/etc/TZ ]] ; then |
190 |
ewarn "Please remember to set your timezone in /etc/TZ" |
191 |
|
192 |
|
193 |
|
194 |
1.39 sys-libs/uclibc/ChangeLog |
195 |
|
196 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/ChangeLog?rev=1.39&view=markup |
197 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/ChangeLog?rev=1.39&content-type=text/plain |
198 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/ChangeLog?r1=1.38&r2=1.39 |
199 |
|
200 |
Index: ChangeLog |
201 |
=================================================================== |
202 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v |
203 |
retrieving revision 1.38 |
204 |
retrieving revision 1.39 |
205 |
diff -u -r1.38 -r1.39 |
206 |
--- ChangeLog 29 Oct 2008 15:35:58 -0000 1.38 |
207 |
+++ ChangeLog 1 Nov 2008 07:33:09 -0000 1.39 |
208 |
@@ -1,6 +1,13 @@ |
209 |
# ChangeLog for sys-libs/uclibc |
210 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
211 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.38 2008/10/29 15:35:58 solar Exp $ |
212 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.39 2008/11/01 07:33:09 vapier Exp $ |
213 |
+ |
214 |
+ 01 Nov 2008; Mike Frysinger <vapier@g.o> uclibc-0.9.27-r1.ebuild, |
215 |
+ uclibc-0.9.28.3.ebuild, uclibc-0.9.28.3-r3.ebuild, |
216 |
+ uclibc-0.9.28.3-r6.ebuild, uclibc-0.9.28.3-r7.ebuild, |
217 |
+ uclibc-0.9.30_rc1.ebuild, uclibc-0.9.30_rc3.ebuild: |
218 |
+ Unify some ebuild differences and fix header-only install with newer |
219 |
+ versions #234748 by Nathan Brink. |
220 |
|
221 |
*uclibc-0.9.30_rc3 (29 Oct 2008) |
222 |
|
223 |
|
224 |
|
225 |
|
226 |
1.9 sys-libs/uclibc/uclibc-0.9.28.3.ebuild |
227 |
|
228 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3.ebuild?rev=1.9&view=markup |
229 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3.ebuild?rev=1.9&content-type=text/plain |
230 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3.ebuild?r1=1.8&r2=1.9 |
231 |
|
232 |
Index: uclibc-0.9.28.3.ebuild |
233 |
=================================================================== |
234 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3.ebuild,v |
235 |
retrieving revision 1.8 |
236 |
retrieving revision 1.9 |
237 |
diff -u -r1.8 -r1.9 |
238 |
--- uclibc-0.9.28.3.ebuild 27 Oct 2008 06:53:14 -0000 1.8 |
239 |
+++ uclibc-0.9.28.3.ebuild 1 Nov 2008 07:33:09 -0000 1.9 |
240 |
@@ -1,6 +1,6 @@ |
241 |
# Copyright 1999-2008 Gentoo Foundation |
242 |
# Distributed under the terms of the GNU General Public License v2 |
243 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3.ebuild,v 1.8 2008/10/27 06:53:14 vapier Exp $ |
244 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3.ebuild,v 1.9 2008/11/01 07:33:09 vapier Exp $ |
245 |
|
246 |
#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" |
247 |
#inherit subversion |
248 |
@@ -424,25 +424,25 @@ |
249 |
# system headers correctly. See gcc/doc/gccinstall.info |
250 |
if [[ ${CTARGET} != ${CHOST} ]] ; then |
251 |
dosym usr/include /usr/${CTARGET}/sys-include |
252 |
- newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
253 |
- newbin utils/ldd.host ${CTARGET}-ldd || die |
254 |
+ if ! just_headers ; then |
255 |
+ newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
256 |
+ newbin utils/ldd.host ${CTARGET}-ldd || die |
257 |
+ fi |
258 |
return 0 |
259 |
fi |
260 |
|
261 |
- if [[ ${CHOST} == *-uclibc ]] ; then |
262 |
- make DESTDIR="${D}" install_utils || die "install-utils failed" |
263 |
+ if [[ ${CHOST} == *-uclibc* ]] ; then |
264 |
+ emake DESTDIR="${D}" install_utils || die "install-utils failed" |
265 |
dobin extra/scripts/getent |
266 |
fi |
267 |
|
268 |
- if ! use build ; then |
269 |
- dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
270 |
- doman docs/man/*.[1-9] |
271 |
- fi |
272 |
+ dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
273 |
+ doman docs/man/*.[1-9] |
274 |
} |
275 |
|
276 |
pkg_postinst() { |
277 |
[[ ${CTARGET} != ${CHOST} ]] && return 0 |
278 |
- [[ ${CHOST} != *-uclibc ]] && return 0 |
279 |
+ [[ ${CHOST} != *-uclibc* ]] && return 0 |
280 |
|
281 |
if [[ ! -e ${ROOT}/etc/TZ ]] ; then |
282 |
ewarn "Please remember to set your timezone in /etc/TZ" |
283 |
|
284 |
|
285 |
|
286 |
1.3 sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild |
287 |
|
288 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild?rev=1.3&view=markup |
289 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild?rev=1.3&content-type=text/plain |
290 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild?r1=1.2&r2=1.3 |
291 |
|
292 |
Index: uclibc-0.9.28.3-r6.ebuild |
293 |
=================================================================== |
294 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild,v |
295 |
retrieving revision 1.2 |
296 |
retrieving revision 1.3 |
297 |
diff -u -r1.2 -r1.3 |
298 |
--- uclibc-0.9.28.3-r6.ebuild 27 Oct 2008 06:53:14 -0000 1.2 |
299 |
+++ uclibc-0.9.28.3-r6.ebuild 1 Nov 2008 07:33:09 -0000 1.3 |
300 |
@@ -1,6 +1,6 @@ |
301 |
# Copyright 1999-2008 Gentoo Foundation |
302 |
# Distributed under the terms of the GNU General Public License v2 |
303 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild,v 1.2 2008/10/27 06:53:14 vapier Exp $ |
304 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.28.3-r6.ebuild,v 1.3 2008/11/01 07:33:09 vapier Exp $ |
305 |
|
306 |
#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" |
307 |
#inherit subversion |
308 |
@@ -424,25 +424,25 @@ |
309 |
# system headers correctly. See gcc/doc/gccinstall.info |
310 |
if [[ ${CTARGET} != ${CHOST} ]] ; then |
311 |
dosym usr/include /usr/${CTARGET}/sys-include |
312 |
- newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
313 |
- newbin utils/ldd.host ${CTARGET}-ldd || die |
314 |
+ if ! just_headers ; then |
315 |
+ newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
316 |
+ newbin utils/ldd.host ${CTARGET}-ldd || die |
317 |
+ fi |
318 |
return 0 |
319 |
fi |
320 |
|
321 |
- if [[ ${CHOST} == *-uclibc ]] ; then |
322 |
- make DESTDIR="${D}" install_utils || die "install-utils failed" |
323 |
+ if [[ ${CHOST} == *-uclibc* ]] ; then |
324 |
+ emake DESTDIR="${D}" install_utils || die "install-utils failed" |
325 |
dobin extra/scripts/getent |
326 |
fi |
327 |
|
328 |
- if ! use build ; then |
329 |
- dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
330 |
- doman docs/man/*.[1-9] |
331 |
- fi |
332 |
+ dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
333 |
+ doman docs/man/*.[1-9] |
334 |
} |
335 |
|
336 |
pkg_postinst() { |
337 |
[[ ${CTARGET} != ${CHOST} ]] && return 0 |
338 |
- [[ ${CHOST} != *-uclibc ]] && return 0 |
339 |
+ [[ ${CHOST} != *-uclibc* ]] && return 0 |
340 |
|
341 |
if [[ ! -e ${ROOT}/etc/TZ ]] ; then |
342 |
ewarn "Please remember to set your timezone in /etc/TZ" |
343 |
|
344 |
|
345 |
|
346 |
1.3 sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild |
347 |
|
348 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild?rev=1.3&view=markup |
349 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild?rev=1.3&content-type=text/plain |
350 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild?r1=1.2&r2=1.3 |
351 |
|
352 |
Index: uclibc-0.9.30_rc1.ebuild |
353 |
=================================================================== |
354 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild,v |
355 |
retrieving revision 1.2 |
356 |
retrieving revision 1.3 |
357 |
diff -u -r1.2 -r1.3 |
358 |
--- uclibc-0.9.30_rc1.ebuild 24 Sep 2008 14:44:37 -0000 1.2 |
359 |
+++ uclibc-0.9.30_rc1.ebuild 1 Nov 2008 07:33:09 -0000 1.3 |
360 |
@@ -1,6 +1,6 @@ |
361 |
# Copyright 1999-2008 Gentoo Foundation |
362 |
# Distributed under the terms of the GNU General Public License v2 |
363 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild,v 1.2 2008/09/24 14:44:37 mr_bones_ Exp $ |
364 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.30_rc1.ebuild,v 1.3 2008/11/01 07:33:09 vapier Exp $ |
365 |
|
366 |
#ESVN_REPO_URI="svn://uclibc.org/trunk/uClibc" |
367 |
#inherit subversion |
368 |
@@ -424,8 +424,6 @@ |
369 |
just_headers && target="install_headers" |
370 |
emake DESTDIR="${sysroot}" ${target} || die "install failed" |
371 |
|
372 |
- just_headers && return 0 |
373 |
- |
374 |
save_config .config |
375 |
|
376 |
# remove files coming from kernel-headers |
377 |
@@ -436,20 +434,20 @@ |
378 |
# system headers correctly. See gcc/doc/gccinstall.info |
379 |
if [[ ${CTARGET} != ${CHOST} ]] ; then |
380 |
dosym usr/include /usr/${CTARGET}/sys-include |
381 |
- newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
382 |
- newbin utils/ldd.host ${CTARGET}-ldd || die |
383 |
+ if ! just_headers ; then |
384 |
+ newbin utils/ldconfig.host ${CTARGET}-ldconfig || die |
385 |
+ newbin utils/ldd.host ${CTARGET}-ldd || die |
386 |
+ fi |
387 |
return 0 |
388 |
fi |
389 |
|
390 |
if [[ ${CHOST} == *-uclibc* ]] ; then |
391 |
- make DESTDIR="${D}" install_utils || die "install-utils failed" |
392 |
+ emake DESTDIR="${D}" install_utils || die "install-utils failed" |
393 |
dobin extra/scripts/getent |
394 |
fi |
395 |
|
396 |
- if ! use build ; then |
397 |
- dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
398 |
- doman docs/man/*.[1-9] |
399 |
- fi |
400 |
+ dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
401 |
+ doman docs/man/*.[1-9] |
402 |
} |
403 |
|
404 |
pkg_postinst() { |
405 |
|
406 |
|
407 |
|
408 |
1.32 sys-libs/uclibc/uclibc-0.9.27-r1.ebuild |
409 |
|
410 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild?rev=1.32&view=markup |
411 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild?rev=1.32&content-type=text/plain |
412 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild?r1=1.31&r2=1.32 |
413 |
|
414 |
Index: uclibc-0.9.27-r1.ebuild |
415 |
=================================================================== |
416 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v |
417 |
retrieving revision 1.31 |
418 |
retrieving revision 1.32 |
419 |
diff -u -r1.31 -r1.32 |
420 |
--- uclibc-0.9.27-r1.ebuild 27 Oct 2008 06:53:14 -0000 1.31 |
421 |
+++ uclibc-0.9.27-r1.ebuild 1 Nov 2008 07:33:09 -0000 1.32 |
422 |
@@ -1,6 +1,6 @@ |
423 |
# Copyright 1999-2008 Gentoo Foundation |
424 |
# Distributed under the terms of the GNU General Public License v2 |
425 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.31 2008/10/27 06:53:14 vapier Exp $ |
426 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-0.9.27-r1.ebuild,v 1.32 2008/11/01 07:33:09 vapier Exp $ |
427 |
|
428 |
inherit eutils flag-o-matic toolchain-funcs |
429 |
|
430 |
@@ -356,7 +356,7 @@ |
431 |
|
432 |
local target="install" |
433 |
just_headers && target="install_dev" |
434 |
- make PREFIX="${sysroot}" ${target} || die "install failed" |
435 |
+ emake PREFIX="${sysroot}" ${target} || die "install failed" |
436 |
|
437 |
# remove files coming from kernel-headers |
438 |
rm -rf "${D}"${sysroot}/usr/include/{asm,linux,asm-generic} |
439 |
@@ -373,20 +373,18 @@ |
440 |
return 0 |
441 |
fi |
442 |
|
443 |
- if [[ ${CHOST} == *-uclibc ]] ; then |
444 |
+ if [[ ${CHOST} == *-uclibc* ]] ; then |
445 |
emake PREFIX="${D}" install_utils || die "install-utils failed" |
446 |
dobin extra/scripts/getent |
447 |
fi |
448 |
|
449 |
- if ! use build ; then |
450 |
- dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
451 |
- doman debian/*.1 |
452 |
- fi |
453 |
+ dodoc Changelog* README TODO docs/*.txt DEDICATION.mjn3 |
454 |
+ doman debian/*.1 |
455 |
} |
456 |
|
457 |
pkg_postinst() { |
458 |
[[ ${CTARGET} != ${CHOST} ]] && return 0 |
459 |
- [[ ${CHOST} != *-uclibc ]] && return 0 |
460 |
+ [[ ${CHOST} != *-uclibc* ]] && return 0 |
461 |
|
462 |
if [[ ! -e ${ROOT}/etc/TZ ]] ; then |
463 |
ewarn "Please remember to set your timezone in /etc/TZ" |