r190 - in trunk/BOOK: chapter05 chapter06

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Sun Feb 13 12:14:33 PST 2005


Author: manuel
Date: 2005-02-13 13:14:32 -0700 (Sun, 13 Feb 2005)
New Revision: 190

Modified:
   trunk/BOOK/chapter05/gcc-cross.xml
   trunk/BOOK/chapter06/gcc.xml
Log:
Changed harcoded version numbers by entities.

Modified: trunk/BOOK/chapter05/gcc-cross.xml
===================================================================
--- trunk/BOOK/chapter05/gcc-cross.xml	2005-02-13 20:10:04 UTC (rev 189)
+++ trunk/BOOK/chapter05/gcc-cross.xml	2005-02-13 20:14:32 UTC (rev 190)
@@ -77,7 +77,7 @@
 
 <para>Prepare Gcc for compilation:</para>
 
-<screen><userinput>../gcc-3.4.3/configure --prefix=/tools --target=${target} \
+<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools --target=${target} \
     --with-local-prefix=/tools --disable-nls \
     --disable-shared --enable-languages=c \
     --with-dynamic-linker=${ldso} --with-nostdinc</userinput></screen>

Modified: trunk/BOOK/chapter06/gcc.xml
===================================================================
--- trunk/BOOK/chapter06/gcc.xml	2005-02-13 20:10:04 UTC (rev 189)
+++ trunk/BOOK/chapter06/gcc.xml	2005-02-13 20:14:32 UTC (rev 190)
@@ -48,17 +48,17 @@
 <para condition="uclibc">Apply these patches. The locale patch is needed
 even without locales installed:</para>
 
-<screen condition="uclibc"><userinput>patch -Np1 -i ../gcc-3.4.3-uClibc_conf-1.patch
-patch -Np1 -i ../gcc-3.4.3-uClibc_libstdc++-1.patch
-patch -Np1 -i ../gcc-3.4.3-uClibc_locale-1.patch</userinput></screen>
+<screen condition="uclibc"><userinput>patch -Np1 -i ../gcc-&gcc-version;-uClibc_conf-1.patch
+patch -Np1 -i ../gcc-&gcc-version;-uClibc_libstdc++-1.patch
+patch -Np1 -i ../gcc-&gcc-version;-uClibc_locale-1.patch</userinput></screen>
 
 <para>Apply this set of patches:</para>
 
-<screen><userinput>patch -Np1 -i ../gcc-3.4.3-hardened_cflags-1.patch
-patch -Np1 -i ../gcc-3.4.3-specs_x86-1.patch
-patch -Np1 -i ../gcc-3.4.3-no_fixincludes-1.patch
-patch -Np1 -i ../gcc-3.4.3-ssp-3.patch
-patch -Np1 -i ../gcc-3.4.3-linkonce-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../gcc-&gcc-version;-hardened_cflags-1.patch
+patch -Np1 -i ../gcc-&gcc-version;-specs_x86-1.patch
+patch -Np1 -i ../gcc-&gcc-version;-no_fixincludes-1.patch
+patch -Np1 -i ../gcc-&gcc-version;-ssp-3.patch
+patch -Np1 -i ../gcc-&gcc-version;-linkonce-1.patch</userinput></screen>
 
 <para>Fix <filename>libiberty/Makefile.in</filename>:</para>
 
@@ -68,7 +68,7 @@
 <filename>version.c</filename> recommends:</para>
 
 <screen><userinput>sed -e 's at gcc.gnu.org/bugs.html at bugs.linuxfromscratch.org/@' \
-        -e 's/3.4.3/3.4.3 (ssp)/' -i gcc/version.c</userinput></screen>
+        -e 's/&gcc-version;/&gcc-version; (ssp)/' -i gcc/version.c</userinput></screen>
 
 <para>Create a separate build directory again:</para>
 
@@ -77,7 +77,7 @@
 
 <para>Prepare GCC for compilation:</para>
 
-<screen><userinput>../gcc-3.4.3/configure --prefix=/usr \
+<screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
     --host=${target} --build=${target} --target=${target} \
     --libexecdir=/usr/lib --enable-threads=posix \
     --enable-shared --enable-__cxa_atexit \
@@ -115,10 +115,10 @@
 <para>Remove the statics libs installed by GCC:</para>
 
 <screen condition="glibc"><userinput>rm /usr/lib/{libsupc++,libstdc++}.a
-rm /usr/lib/gcc/${target}/3.4.3/libgcov.a</userinput></screen>
+rm /usr/lib/gcc/${target}/&gcc-version;/libgcov.a</userinput></screen>
 
 <screen condition="uclibc"><userinput>rm /usr/lib/{libsupc++,libstdc++}.a
-rm /usr/lib/gcc/${target}/3.4.3/libgcov.a
+rm /usr/lib/gcc/${target}/&gcc-version;/libgcov.a
 rm /usr/lib/libstdc++_pic.a</userinput></screen>
 
 <para><filename class="libraryfile">libc.a</filename> can be removed now too:</para>




More information about the hlfs-dev mailing list