1 |
vapier 09/01/29 00:11:26 |
2 |
|
3 |
Modified: toolchain.eclass |
4 |
Log: |
5 |
improve pruning of empty dirs and bogus symlinks in fixed-includes |
6 |
|
7 |
Revision Changes Path |
8 |
1.388 eclass/toolchain.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.388&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.388&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.387&r2=1.388 |
13 |
|
14 |
Index: toolchain.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v |
17 |
retrieving revision 1.387 |
18 |
retrieving revision 1.388 |
19 |
diff -u -r1.387 -r1.388 |
20 |
--- toolchain.eclass 28 Jan 2009 23:40:38 -0000 1.387 |
21 |
+++ toolchain.eclass 29 Jan 2009 00:11:26 -0000 1.388 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2008 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.387 2009/01/28 23:40:38 vapier Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.388 2009/01/29 00:11:26 vapier Exp $ |
27 |
# |
28 |
# Maintainer: Toolchain Ninjas <toolchain@g.o> |
29 |
|
30 |
@@ -1683,19 +1683,16 @@ |
31 |
gcc-compiler_src_install() { |
32 |
local x= |
33 |
|
34 |
- # Do allow symlinks in ${PREFIX}/lib/gcc-lib/${CHOST}/${GCC_CONFIG_VER}/include as |
35 |
- # this can break the build. |
36 |
- for x in "${WORKDIR}"/build/gcc/include*/* ; do |
37 |
- [[ -L ${x} ]] && rm -f "${x}" |
38 |
- done |
39 |
+ cd "${WORKDIR}"/build |
40 |
+ # Do allow symlinks in private gcc include dir as this can break the build |
41 |
+ find gcc/include*/ -type l -print0 | xargs rm -f |
42 |
# Remove generated headers, as they can cause things to break |
43 |
# (ncurses, openssl, etc). |
44 |
- for x in $(find "${WORKDIR}"/build/gcc/include*/ -name '*.h') ; do |
45 |
+ for x in $(find gcc/include*/ -name '*.h') ; do |
46 |
grep -q 'It has been auto-edited by fixincludes from' "${x}" \ |
47 |
&& rm -f "${x}" |
48 |
done |
49 |
# Do the 'make install' from the build directory |
50 |
- cd "${WORKDIR}"/build |
51 |
S=${WORKDIR}/build \ |
52 |
emake DESTDIR="${D}" install || die |
53 |
# Punt some tools which are really only useful while building gcc |
54 |
@@ -1809,7 +1806,9 @@ |
55 |
|| prepman "${DATAPATH}" |
56 |
fi |
57 |
# prune empty dirs left behind |
58 |
- find "${D}" -type d | xargs rmdir >& /dev/null |
59 |
+ for x in 1 2 3 4 ; do |
60 |
+ find "${D}" -type d -exec rmdir "{}" \; >& /dev/null |
61 |
+ done |
62 |
|
63 |
# install testsuite results |
64 |
if use test; then |