1 |
nightmorph 08/07/20 00:34:37 |
2 |
|
3 |
Modified: change-chost.xml gcc-upgrading.xml |
4 |
Log: |
5 |
updated gcc upgrading and changing chost guides for bug 232193: the location of fix_libtool_files.sh has changed. |
6 |
|
7 |
Revision Changes Path |
8 |
1.5 xml/htdocs/doc/en/change-chost.xml |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/change-chost.xml?rev=1.5&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/change-chost.xml?rev=1.5&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/change-chost.xml?r1=1.4&r2=1.5 |
13 |
|
14 |
Index: change-chost.xml |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/change-chost.xml,v |
17 |
retrieving revision 1.4 |
18 |
retrieving revision 1.5 |
19 |
diff -u -r1.4 -r1.5 |
20 |
--- change-chost.xml 23 May 2008 19:42:54 -0000 1.4 |
21 |
+++ change-chost.xml 20 Jul 2008 00:34:37 -0000 1.5 |
22 |
@@ -1,6 +1,6 @@ |
23 |
<?xml version="1.0" encoding="UTF-8"?> |
24 |
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> |
25 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/change-chost.xml,v 1.4 2008/05/23 19:42:54 swift Exp $ --> |
26 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/change-chost.xml,v 1.5 2008/07/20 00:34:37 nightmorph Exp $ --> |
27 |
|
28 |
<guide link="/doc/en/change-chost.xml" lang="en"> |
29 |
|
30 |
@@ -24,8 +24,8 @@ |
31 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
32 |
<license/> |
33 |
|
34 |
-<version>2</version> |
35 |
-<date>2007-07-16</date> |
36 |
+<version>3</version> |
37 |
+<date>2008-07-29</date> |
38 |
|
39 |
<chapter> |
40 |
<title>Introduction</title> |
41 |
@@ -254,13 +254,16 @@ |
42 |
|
43 |
<p> |
44 |
Now it is necessary to re-emerge <c>libtool</c> and run |
45 |
-<c>fix_libtool_files.sh</c>. Make sure to use the correct gcc version: (your |
46 |
-current one, 4.1.1 here, and the old architecture, i386 here). |
47 |
+<c>/usr/share/gcc-data/$CHOST/<gcc-version>/fix_libtool_files.sh</c>. Make |
48 |
+sure to use the correct gcc version (your current one, 4.1.1 here, and the old |
49 |
+architecture, i386 here). Replace $CHOST with your new CHOST, and |
50 |
+<gcc-version> with your gcc version. This example assumes a CHOST of |
51 |
+i686. |
52 |
</p> |
53 |
|
54 |
<pre caption="Ensuring library sanity"> |
55 |
# <i>emerge -av1 libtool</i> |
56 |
-# <i>fix_libtool_files.sh 4.1.1 --oldarch i386-pc-linux-gnu</i> |
57 |
+# <i>/usr/share/gcc-data/i686-pc-linux-gnu/4.1.1/fix_libtool_files.sh 4.1.1 --oldarch i386-pc-linux-gnu</i> |
58 |
</pre> |
59 |
|
60 |
<p> |
61 |
|
62 |
|
63 |
|
64 |
1.28 xml/htdocs/doc/en/gcc-upgrading.xml |
65 |
|
66 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/gcc-upgrading.xml?rev=1.28&view=markup |
67 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/gcc-upgrading.xml?rev=1.28&content-type=text/plain |
68 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/gcc-upgrading.xml?r1=1.27&r2=1.28 |
69 |
|
70 |
Index: gcc-upgrading.xml |
71 |
=================================================================== |
72 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/gcc-upgrading.xml,v |
73 |
retrieving revision 1.27 |
74 |
retrieving revision 1.28 |
75 |
diff -u -r1.27 -r1.28 |
76 |
--- gcc-upgrading.xml 19 May 2008 21:02:24 -0000 1.27 |
77 |
+++ gcc-upgrading.xml 20 Jul 2008 00:34:37 -0000 1.28 |
78 |
@@ -1,5 +1,5 @@ |
79 |
<?xml version='1.0' encoding="UTF-8"?> |
80 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/gcc-upgrading.xml,v 1.27 2008/05/19 21:02:24 swift Exp $ --> |
81 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/gcc-upgrading.xml,v 1.28 2008/07/20 00:34:37 nightmorph Exp $ --> |
82 |
|
83 |
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> |
84 |
|
85 |
@@ -13,7 +13,10 @@ |
86 |
<mail link="jkt@g.o">Jan Kundrát</mail> |
87 |
</author> |
88 |
<author title="Editor"> |
89 |
- <mail link="mark@×××××××.com">Mark Loeser</mail> |
90 |
+ <mail link="halcy0n"/> |
91 |
+</author> |
92 |
+<author title="Editor"> |
93 |
+ <mail link="nightmorph"/> |
94 |
</author> |
95 |
|
96 |
<abstract> |
97 |
@@ -25,8 +28,8 @@ |
98 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
99 |
<license/> |
100 |
|
101 |
-<version>22</version> |
102 |
-<date>2007-04-03</date> |
103 |
+<version>23</version> |
104 |
+<date>2008-07-19</date> |
105 |
|
106 |
<chapter id="intro"> |
107 |
<title>Introduction</title> |
108 |
@@ -116,7 +119,9 @@ |
109 |
|
110 |
<comment>If you upgraded from gcc 3 to 4 (e.g. from 3.4.6 to 4.1.1 in this |
111 |
example) you will have to run fix_libtool_files.sh manually</comment> |
112 |
-# <i>fix_libtool_files.sh 3.4.6</i> |
113 |
+<comment>(Replace $CHOST with your actual CHOST, found in /etc/make.conf)</comment> |
114 |
+<comment>(Replace <gcc-version> with your new, updated GCC version)</comment> |
115 |
+# <i>/usr/share/gcc-data/$CHOST/<gcc-version>/fix_libtool_files.sh 3.4.6</i> |
116 |
|
117 |
<comment>(Rebuilding libtool)</comment> |
118 |
# <i>emerge --oneshot -av libtool</i> |
119 |
@@ -280,7 +285,9 @@ |
120 |
|
121 |
<comment>If you upgraded from gcc 3 to 4 (e.g. from 3.3.6 to 4.1.1 in this |
122 |
example) you will have to run fix_libtool_files.sh manually</comment> |
123 |
-# <i>fix_libtool_files.sh 3.3.6</i> |
124 |
+<comment>(Replace $CHOST with your actual CHOST, found in /etc/make.conf)</comment> |
125 |
+<comment>(Replace <gcc-version> with your new, updated GCC version)</comment> |
126 |
+# <i>/usr/share/gcc-data/$CHOST/<gcc-version>/fix_libtool_files.sh 3.3.6</i> |
127 |
|
128 |
<comment>(Rebuilding libtool)</comment> |
129 |
# <i>emerge --oneshot -av libtool</i> |
130 |
@@ -479,8 +486,10 @@ |
131 |
<p> |
132 |
If your system complains about something like <e>libtool: link: |
133 |
`/usr/lib/gcc-lib/i686-pc-linux-gnu/3.3.6/libstdc++.la' is not a valid libtool |
134 |
-archive</e>, please run <c>/sbin/fix_libtool_files.sh 3.3.6</c> (substitute |
135 |
-"3.3.6" with the version numbers from the error message). |
136 |
+archive</e>, please run |
137 |
+<c>/usr/share/gcc-data/$CHOST/<gcc-version>/fix_libtool_files.sh 3.3.6</c> |
138 |
+(substitute "3.3.6" with the version numbers from the error message, and $CHOST |
139 |
+and <gcc-version> with your actual CHOST and GCC version). |
140 |
</p> |
141 |
|
142 |
<p> |