1 |
vapier 08/06/02 15:38:52 |
2 |
|
3 |
Modified: mount-boot.eclass toolchain.eclass |
4 |
Log: |
5 |
use elog for DONT_MOUNT_BOOT user message #223311 |
6 |
|
7 |
Revision Changes Path |
8 |
1.14 eclass/mount-boot.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mount-boot.eclass?rev=1.14&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mount-boot.eclass?rev=1.14&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/mount-boot.eclass?r1=1.13&r2=1.14 |
13 |
|
14 |
Index: mount-boot.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/mount-boot.eclass,v |
17 |
retrieving revision 1.13 |
18 |
retrieving revision 1.14 |
19 |
diff -u -r1.13 -r1.14 |
20 |
--- mount-boot.eclass 25 May 2007 05:04:08 -0000 1.13 |
21 |
+++ mount-boot.eclass 2 Jun 2008 15:38:52 -0000 1.14 |
22 |
@@ -1,6 +1,6 @@ |
23 |
-# Copyright 1999-2007 Gentoo Foundation |
24 |
+# Copyright 1999-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mount-boot.eclass,v 1.13 2007/05/25 05:04:08 vapier Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mount-boot.eclass,v 1.14 2008/06/02 15:38:52 vapier Exp $ |
28 |
# |
29 |
# This eclass is really only useful for bootloaders. |
30 |
# |
31 |
@@ -16,10 +16,10 @@ |
32 |
if [[ -n ${DONT_MOUNT_BOOT} ]] ; then |
33 |
return |
34 |
else |
35 |
- einfo |
36 |
- einfo "To avoid automounting and autoinstalling with /boot," |
37 |
- einfo "just export the DONT_MOUNT_BOOT variable." |
38 |
- einfo |
39 |
+ elog |
40 |
+ elog "To avoid automounting and autoinstalling with /boot," |
41 |
+ elog "just export the DONT_MOUNT_BOOT variable." |
42 |
+ elog |
43 |
fi |
44 |
|
45 |
# note that /dev/BOOT is in the Gentoo default /etc/fstab file |
46 |
|
47 |
|
48 |
|
49 |
1.355 eclass/toolchain.eclass |
50 |
|
51 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.355&view=markup |
52 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.355&content-type=text/plain |
53 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.354&r2=1.355 |
54 |
|
55 |
Index: toolchain.eclass |
56 |
=================================================================== |
57 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
58 |
retrieving revision 1.354 |
59 |
retrieving revision 1.355 |
60 |
diff -u -r1.354 -r1.355 |
61 |
--- toolchain.eclass 22 Apr 2008 19:26:52 -0000 1.354 |
62 |
+++ toolchain.eclass 2 Jun 2008 15:38:52 -0000 1.355 |
63 |
@@ -1,6 +1,6 @@ |
64 |
# Copyright 1999-2008 Gentoo Foundation |
65 |
# Distributed under the terms of the GNU General Public License v2 |
66 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.354 2008/04/22 19:26:52 vapier Exp $ |
67 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.355 2008/06/02 15:38:52 vapier Exp $ |
68 |
# |
69 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
70 |
|
71 |
@@ -1240,7 +1240,7 @@ |
72 |
[[ $(tc-is-softfloat) == "yes" ]] && confgcc="${confgcc} --with-float=soft" |
73 |
|
74 |
# Native Language Support |
75 |
- if use nls && ! use build ; then |
76 |
+ if use nls ; then |
77 |
confgcc="${confgcc} --enable-nls --without-included-gettext" |
78 |
else |
79 |
confgcc="${confgcc} --disable-nls" |
80 |
@@ -1416,10 +1416,10 @@ |
81 |
${GCC_MAKE_TARGET} \ |
82 |
|| die "emake failed with ${GCC_MAKE_TARGET}" |
83 |
|
84 |
- if ! use build && ! is_crosscompile && ! use nocxx && use doc ; then |
85 |
+ if ! is_crosscompile && ! use nocxx && use doc ; then |
86 |
if type -p doxygen > /dev/null ; then |
87 |
cd "${CTARGET}"/libstdc++-v3 |
88 |
- make doxygen-man || ewarn "failed to make docs" |
89 |
+ emake doxygen-man || ewarn "failed to make docs" |
90 |
else |
91 |
ewarn "Skipping libstdc++ manpage generation since you don't have doxygen installed" |
92 |
fi |
93 |
@@ -1651,74 +1651,72 @@ |
94 |
|
95 |
# Make sure we dont have stuff lying around that |
96 |
# can nuke multiple versions of gcc |
97 |
- if ! use build ; then |
98 |
- cd "${D}"${LIBPATH} |
99 |
+ cd "${D}"${LIBPATH} |
100 |
|
101 |
- # Move Java headers to compiler-specific dir |
102 |
- for x in "${D}"${PREFIX}/include/gc*.h "${D}"${PREFIX}/include/j*.h ; do |
103 |
- [[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/include/ |
104 |
- done |
105 |
- for x in gcj gnu java javax org ; do |
106 |
- if [[ -d ${D}${PREFIX}/include/${x} ]] ; then |
107 |
- dodir /${LIBPATH}/include/${x} |
108 |
- mv -f "${D}"${PREFIX}/include/${x}/* "${D}"${LIBPATH}/include/${x}/ |
109 |
- rm -rf "${D}"${PREFIX}/include/${x} |
110 |
- fi |
111 |
- done |
112 |
- |
113 |
- if [[ -d ${D}${PREFIX}/lib/security ]] ; then |
114 |
- dodir /${LIBPATH}/security |
115 |
- mv -f "${D}"${PREFIX}/lib/security/* "${D}"${LIBPATH}/security |
116 |
- rm -rf "${D}"${PREFIX}/lib/security |
117 |
- fi |
118 |
- |
119 |
- # Move libgcj.spec to compiler-specific directories |
120 |
- [[ -f ${D}${PREFIX}/lib/libgcj.spec ]] && \ |
121 |
- mv -f "${D}"${PREFIX}/lib/libgcj.spec "${D}"${LIBPATH}/libgcj.spec |
122 |
- |
123 |
- # Rename jar because it could clash with Kaffe's jar if this gcc is |
124 |
- # primary compiler (aka don't have the -<version> extension) |
125 |
- cd "${D}"${BINPATH} |
126 |
- [[ -f jar ]] && mv -f jar gcj-jar |
127 |
- |
128 |
- # Move <cxxabi.h> to compiler-specific directories |
129 |
- [[ -f ${D}${STDCXX_INCDIR}/cxxabi.h ]] && \ |
130 |
- mv -f "${D}"${STDCXX_INCDIR}/cxxabi.h "${D}"${LIBPATH}/include/ |
131 |
- |
132 |
- # These should be symlinks |
133 |
- dodir /usr/bin |
134 |
- cd "${D}"${BINPATH} |
135 |
- for x in cpp gcc g++ c++ g77 gcj gcjh gfortran ; do |
136 |
- # For some reason, g77 gets made instead of ${CTARGET}-g77... |
137 |
- # this should take care of that |
138 |
- [[ -f ${x} ]] && mv ${x} ${CTARGET}-${x} |
139 |
- |
140 |
- if [[ -f ${CTARGET}-${x} ]] && ! is_crosscompile ; then |
141 |
- ln -sf ${CTARGET}-${x} ${x} |
142 |
- |
143 |
- # Create version-ed symlinks |
144 |
- dosym ${BINPATH}/${CTARGET}-${x} \ |
145 |
- /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} |
146 |
- dosym ${BINPATH}/${CTARGET}-${x} \ |
147 |
- /usr/bin/${x}-${GCC_CONFIG_VER} |
148 |
- fi |
149 |
- |
150 |
- if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then |
151 |
- rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER} |
152 |
- ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} |
153 |
- fi |
154 |
- done |
155 |
+ # Move Java headers to compiler-specific dir |
156 |
+ for x in "${D}"${PREFIX}/include/gc*.h "${D}"${PREFIX}/include/j*.h ; do |
157 |
+ [[ -f ${x} ]] && mv -f "${x}" "${D}"${LIBPATH}/include/ |
158 |
+ done |
159 |
+ for x in gcj gnu java javax org ; do |
160 |
+ if [[ -d ${D}${PREFIX}/include/${x} ]] ; then |
161 |
+ dodir /${LIBPATH}/include/${x} |
162 |
+ mv -f "${D}"${PREFIX}/include/${x}/* "${D}"${LIBPATH}/include/${x}/ |
163 |
+ rm -rf "${D}"${PREFIX}/include/${x} |
164 |
+ fi |
165 |
+ done |
166 |
|
167 |
- # I do not know if this will break gcj stuff, so I'll only do it for |
168 |
- # objc for now; basically "ffi.h" is the correct file to include, |
169 |
- # but it gets installed in .../GCCVER/include and yet it does |
170 |
- # "#include <ffitarget.h>" which (correctly, as it's an "extra" file) |
171 |
- # is installed in .../GCCVER/include/libffi; the following fixes |
172 |
- # ffi.'s include of ffitarget.h - Armando Di Cianno <fafhrd@g.o> |
173 |
- if [[ -d ${D}${LIBPATH}/include/libffi ]] ; then |
174 |
- mv -i "${D}"${LIBPATH}/include/libffi/* "${D}"${LIBPATH}/include || die |
175 |
- rm -r "${D}"${LIBPATH}/include/libffi || die |
176 |
+ if [[ -d ${D}${PREFIX}/lib/security ]] ; then |
177 |
+ dodir /${LIBPATH}/security |
178 |
+ mv -f "${D}"${PREFIX}/lib/security/* "${D}"${LIBPATH}/security |
179 |
+ rm -rf "${D}"${PREFIX}/lib/security |
180 |
+ fi |
181 |
+ |
182 |
+ # Move libgcj.spec to compiler-specific directories |
183 |
+ [[ -f ${D}${PREFIX}/lib/libgcj.spec ]] && \ |
184 |
+ mv -f "${D}"${PREFIX}/lib/libgcj.spec "${D}"${LIBPATH}/libgcj.spec |
185 |
+ |
186 |
+ # Rename jar because it could clash with Kaffe's jar if this gcc is |
187 |
+ # primary compiler (aka don't have the -<version> extension) |
188 |
+ cd "${D}"${BINPATH} |
189 |
+ [[ -f jar ]] && mv -f jar gcj-jar |
190 |
+ |
191 |
+ # Move <cxxabi.h> to compiler-specific directories |
192 |
+ [[ -f ${D}${STDCXX_INCDIR}/cxxabi.h ]] && \ |
193 |
+ mv -f "${D}"${STDCXX_INCDIR}/cxxabi.h "${D}"${LIBPATH}/include/ |
194 |
+ |
195 |
+ # These should be symlinks |
196 |
+ dodir /usr/bin |
197 |
+ cd "${D}"${BINPATH} |
198 |
+ for x in cpp gcc g++ c++ g77 gcj gcjh gfortran ; do |
199 |
+ # For some reason, g77 gets made instead of ${CTARGET}-g77... |
200 |
+ # this should take care of that |
201 |
+ [[ -f ${x} ]] && mv ${x} ${CTARGET}-${x} |
202 |
+ |
203 |
+ if [[ -f ${CTARGET}-${x} ]] && ! is_crosscompile ; then |
204 |
+ ln -sf ${CTARGET}-${x} ${x} |
205 |
+ |
206 |
+ # Create version-ed symlinks |
207 |
+ dosym ${BINPATH}/${CTARGET}-${x} \ |
208 |
+ /usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER} |
209 |
+ dosym ${BINPATH}/${CTARGET}-${x} \ |
210 |
+ /usr/bin/${x}-${GCC_CONFIG_VER} |
211 |
+ fi |
212 |
+ |
213 |
+ if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then |
214 |
+ rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER} |
215 |
+ ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} |
216 |
fi |
217 |
+ done |
218 |
+ |
219 |
+ # I do not know if this will break gcj stuff, so I'll only do it for |
220 |
+ # objc for now; basically "ffi.h" is the correct file to include, |
221 |
+ # but it gets installed in .../GCCVER/include and yet it does |
222 |
+ # "#include <ffitarget.h>" which (correctly, as it's an "extra" file) |
223 |
+ # is installed in .../GCCVER/include/libffi; the following fixes |
224 |
+ # ffi.'s include of ffitarget.h - Armando Di Cianno <fafhrd@g.o> |
225 |
+ if [[ -d ${D}${LIBPATH}/include/libffi ]] ; then |
226 |
+ mv -i "${D}"${LIBPATH}/include/libffi/* "${D}"${LIBPATH}/include || die |
227 |
+ rm -r "${D}"${LIBPATH}/include/libffi || die |
228 |
fi |
229 |
|
230 |
# Now do the fun stripping stuff |
231 |
@@ -1729,7 +1727,7 @@ |
232 |
env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}" |
233 |
|
234 |
cd "${S}" |
235 |
- if use build || is_crosscompile; then |
236 |
+ if is_crosscompile; then |
237 |
rm -rf "${D}"/usr/share/{man,info} |
238 |
rm -rf "${D}"${DATAPATH}/{man,info} |
239 |
else |
240 |
@@ -2338,68 +2336,57 @@ |
241 |
|
242 |
is_cxx() { |
243 |
gcc-lang-supported 'c++' || return 1 |
244 |
- use build && return 1 |
245 |
! use nocxx |
246 |
} |
247 |
|
248 |
is_d() { |
249 |
gcc-lang-supported d || return 1 |
250 |
- use build && return 1 |
251 |
use d |
252 |
} |
253 |
|
254 |
is_f77() { |
255 |
gcc-lang-supported f77 || return 1 |
256 |
- use build && return 1 |
257 |
use fortran |
258 |
} |
259 |
|
260 |
is_f95() { |
261 |
gcc-lang-supported f95 || return 1 |
262 |
- use build && return 1 |
263 |
use fortran |
264 |
} |
265 |
|
266 |
is_fortran() { |
267 |
gcc-lang-supported fortran || return 1 |
268 |
- use build && return 1 |
269 |
use fortran |
270 |
} |
271 |
|
272 |
is_gcj() { |
273 |
gcc-lang-supported java || return 1 |
274 |
- use build && return 1 |
275 |
use gcj |
276 |
} |
277 |
|
278 |
is_libffi() { |
279 |
has libffi ${USE} || return 1 |
280 |
- use build && return 1 |
281 |
use libffi |
282 |
} |
283 |
|
284 |
is_objc() { |
285 |
gcc-lang-supported objc || return 1 |
286 |
- use build && return 1 |
287 |
use objc |
288 |
} |
289 |
|
290 |
is_objcxx() { |
291 |
gcc-lang-supported 'obj-c++' || return 1 |
292 |
- use build && return 1 |
293 |
use objc++ |
294 |
} |
295 |
|
296 |
is_ada() { |
297 |
gcc-lang-supported ada || return 1 |
298 |
- use build && return 1 |
299 |
use ada |
300 |
} |
301 |
|
302 |
is_treelang() { |
303 |
is_crosscompile && return 1 #199924 |
304 |
gcc-lang-supported treelang || return 1 |
305 |
- use build && return 1 |
306 |
#use treelang |
307 |
return 0 |
308 |
} |
309 |
|
310 |
|
311 |
|
312 |
-- |
313 |
gentoo-commits@l.g.o mailing list |