diff options
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter04/gcc.xml | 10 | ||||
| -rw-r--r-- | chapter05/gcc-exp.xml | 6 | ||||
| -rw-r--r-- | chapter05/gcc-inst.xml | 5 | ||||
| -rw-r--r-- | chapter06/gcc-inst.xml | 22 | ||||
| -rw-r--r-- | entities/gcc.ent | 6 |
6 files changed, 30 insertions, 30 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 083c23632..e1db0b3d4 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -6,6 +6,9 @@ <itemizedlist> +<listitem><para>October 6th, 2002 [timothy]: Switched to gcc-core and +gcc-g++.</para></listitem> + <listitem><para>October 6th, 2002 [timothy]: Chapter 06 - Applied Bill Maltby's grammatic-fixes patch.</para></listitem> @@ -397,7 +400,7 @@ to include reporting typos.</para></listitem> CPPFLAGS...re_max_failures fix which is needed on Glibc-2.1 systems.</para></listitem> -<listitem><para>May 30th, 2002 [markh]: Chapter 05 & 06 - Update to +<listitem><para>May 30th, 2002 [markh]: Chapter 05 & 06 - Update to binutils-2.12.1.</para></listitem> <listitem><para>May 30th, 2002 [markh]: Chapter 05 - Bash: Removed @@ -506,9 +509,9 @@ two single quotes to two double quotes (the two single quotes can be mistaken for one double quote which will cause an error).</para></listitem> <listitem><para>May 2nd, 2002 [gerard]: Changed the -<userinput>cd dir && ln -sf</userinput> commands to one single command +<userinput>cd dir && ln -sf</userinput> commands to one single command (such as <userinput>ln -sf bash $LFS/bin/sh</userinput> Same goes for -<userinput>cd dir && mv/cp</userinput> constructions which are now replaced +<userinput>cd dir && mv/cp</userinput> constructions which are now replaced with constructions like <userinput>mv $LFS/usr/bin/{bzcat,bzip2} $LFS/bin</userinput></para></listitem> @@ -530,7 +533,7 @@ that if you want to manually install some locales, instead of all of them, then you first need to create the <filename class="directory">/usr/lib/locale</filename> directory.</para></listitem> -<listitem><para>April 21st,2002 [gerard & markh]: Upgraded to +<listitem><para>April 21st,2002 [gerard & markh]: Upgraded to MAKEDEV-1.5</para></listitem> <listitem><para>April 12th, 2002 [markh]: Added entities/ directory to diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml index 84f9d9ca6..59b15653f 100644 --- a/chapter04/gcc.xml +++ b/chapter04/gcc.xml @@ -1,3 +1,7 @@ -GCC (&gcc-version;) - &gcc-size;: -<ulink url="&ftp;/gcc-&gcc-version;.tar.bz2"/> -<ulink url="&http;/gcc-&gcc-version;.tar.bz2"/> +GCC-core (&gcc-version;) - &gcc-core-size;: +<ulink url="&ftp;/gcc-core-&gcc-version;.tar.bz2"/> +<ulink url="&http;/gcc-core-&gcc-version;.tar.bz2"/> + +GCC-g++ (&gcc-version;) - &gcc-g-size;: +<ulink url="&ftp;/gcc-g++-&gcc-version;.tar.bz2"/> +<ulink url="&http;/gcc-g++-&gcc-version;.tar.bz2"/> diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml index 4ea02babf..764419fcf 100644 --- a/chapter05/gcc-exp.xml +++ b/chapter05/gcc-exp.xml @@ -14,11 +14,6 @@ codes some paths while compiling and so we need to pass /static as the prefix during ./configure. We pass the real install prefix during the make install command later.</para> -<para><userinput>--enable-languages=c:</userinput> This builds the C -compiler. The C++ compiler will be built in Chapter 6, when we rebuild -GCC. Other compilers are available as well. If they are needed, -the --enable-languages parameter may be omitted.</para> - <para><userinput>echo "#define HAVE_GAS_HIDDEN 1":</userinput> This defines the .hidden assembler directive so that we don't build a faulty Glibc later on.</para> @@ -31,4 +26,3 @@ packages to compile them statically.</para> creates the $LFS/static/bin/gcc symlink, which some packages need.</para> </sect2> - diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index 997b7b7fb..3f8f8d5b3 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -5,6 +5,9 @@ install it. Make sure it's unpacked before running the installation commands.</para> +<para>We won't be needing a C++ compiler until Chapter 6. So, only +the gcc-core tarball needs to be unpacked at this time.</para> + <para>This package is known to behave badly when you have changed its default optimization flags (including the -march and -mcpu options). GCC is best left alone. Therefore, if you have defined any environment variables @@ -18,7 +21,7 @@ been warned.</para> patch -Np1 -i ../gcc-3.2-nofixincludes-2.patch && mkdir ../gcc-build && cd ../gcc-build && -../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c \ +../gcc-&gcc-version;/configure --prefix=/static \ --disable-nls --disable-shared && echo "#define HAVE_GAS_HIDDEN 1" >> gcc/auto-host.h && make BOOT_LDFLAGS=-static bootstrap && diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index 73c72211c..e103903d5 100644 --- a/chapter06/gcc-inst.xml +++ b/chapter06/gcc-inst.xml @@ -9,26 +9,21 @@ commands.</para> default optimization flags (including the -march and -mcpu options). GCC is best left alone. Therefore, if you have defined any environment variables that override default optimizations, such as CFLAGS and CXXFLAGS, we -recommend unsetting or modifying them when building Gcc. You have +recommend unsetting or modifying them when building GCC. You have been warned.</para> -<para>Install GCC by running the following commands. These commands will build -the C and C++ compiler. Other compilers are available within the gcc -package. If you want to build all the other available compilers too, -leave out the --enable-languages=c,c++ option in the configure command. -See the GCC documentation for more details on which additional compilers -are available.</para> - -<para>Note: the build of other compilers is not tested by the people -who actively work on LFS.</para> +<para>Install GCC by running the following commands. These commands will +build the C and C++ compilers, so you'll need to unpack both the gcc-core +and gcc-g++ tarballs. Other compilers are available in the full gcc package; +instructions for building them may be found at +<ulink url="&blfs-root;view/cvs/general/gcc.html"/>.</para> <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch && mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/usr --enable-shared \ - --enable-languages=c,c++ --enable-threads=posix \ - --with-slibdir=/lib --enable-__cxa_atexit \ - --enable-clocale=gnu && + --enable-threads=posix --with-slibdir=/lib \ + --enable-__cxa_atexit --enable-clocale=gnu && make bootstrap && make install && ln -s ../usr/bin/cpp /lib && @@ -36,4 +31,3 @@ ln -s ../bin/cpp /usr/lib && ln -s gcc /usr/bin/cc</userinput></screen></para> </sect2> - diff --git a/entities/gcc.ent b/entities/gcc.ent index e049288a4..348a6c678 100644 --- a/entities/gcc.ent +++ b/entities/gcc.ent @@ -17,10 +17,12 @@ <!ENTITY gcc-version "3.2"> <!ENTITY gcc-depversion "2.95.3"> <!ENTITY gcc-contversion "3.1"> -<!ENTITY gcc-size "20,043 KB"> +<!ENTITY gcc-core-size "9,978 KB"> +<!ENTITY gcc-g-size "1,838 KB"> <!ENTITY gcc-patch-version "3.2"> <!ENTITY gcc-patch-size "4 KB"> -<!ENTITY gcc-package "gcc-&gcc-version;.tar.bz2"> +<!ENTITY gcc-core-package "gcc-core-&gcc-version;.tar.bz2"> +<!ENTITY gcc-g-package "gcc-g++-&gcc-version;.tar.bz2"> <!ENTITY gcc-dir "gcc-&gcc-version;"> <!ENTITY gcc-compsize-static "326 MB"> |