From 8b8f29ab88615f3e97fcb798b31588d7349dff61 Mon Sep 17 00:00:00 2001 From: Gerard Beekmans Date: Tue, 31 Dec 2002 15:45:00 +0000 Subject: Added missing git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2244 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixa/gcc-dep.xml | 1 - appendixa/gcc-down.xml | 5 +---- chapter01/changelog.xml | 10 ++++++++++ chapter04/gcc-patch.xml | 2 -- chapter04/packages.xml | 1 - chapter05/gcc-exp.xml | 35 +++++++++++++++++++---------------- chapter05/gcc-inst.xml | 10 +++++----- index.xml | 4 ++-- 8 files changed, 37 insertions(+), 31 deletions(-) delete mode 100644 chapter04/gcc-patch.xml diff --git a/appendixa/gcc-dep.xml b/appendixa/gcc-dep.xml index 664377cbb..6a25150f2 100644 --- a/appendixa/gcc-dep.xml +++ b/appendixa/gcc-dep.xml @@ -11,7 +11,6 @@ Find: find Gcc: cc, cc1, collect2, cpp0, gcc Grep: egrep, grep Make: make -Patch: patch Sed: sed Sh-utils: basename, dirname, echo, expr, hostname, sleep, true, uname Tar: tar diff --git a/appendixa/gcc-down.xml b/appendixa/gcc-down.xml index dcef4628b..6867ef504 100644 --- a/appendixa/gcc-down.xml +++ b/appendixa/gcc-down.xml @@ -2,8 +2,5 @@ Official Download Location GCC (&gcc-version;): - - -GCC nofixincludes Patch (&gcc-version;): - + diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index e54586e1b..1cd08e032 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,11 +40,21 @@ Removed: +gcc-3.2.1-nofixincludes-2.patch kbd-1.06-3.patch ncurses-5.2-2.patch +December 31st, 2002 [gerard]: Chapter 05 - GCC: Removed +nofixincludes patch and use the built-in +install-no-fixedincludes make +target. + +December 31st, 2002 [gerard]: Chapter 05 - GCC: Removed +HAVE_GAS_HIDDEN, added --with-ld and +--with-as configure switches. + December 29th, 2002 [timothy]: Updated to binutils-2.13.2, procps-3.1.5. diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml deleted file mode 100644 index e45514dc1..000000000 --- a/chapter04/gcc-patch.xml +++ /dev/null @@ -1,2 +0,0 @@ -GCC nofixincludes Patch (&gcc-version;) - 1 KB: - diff --git a/chapter04/packages.xml b/chapter04/packages.xml index fff592e75..ae148a5bc 100644 --- a/chapter04/packages.xml +++ b/chapter04/packages.xml @@ -25,7 +25,6 @@ &c4-gawk; &c4-gawk-patch; &c4-gcc; -&c4-gcc-patch; &c4-gettext; &c4-glibc; &c4-glibc-patch; diff --git a/chapter05/gcc-exp.xml b/chapter05/gcc-exp.xml index 736eac8b5..abbf45cae 100644 --- a/chapter05/gcc-exp.xml +++ b/chapter05/gcc-exp.xml @@ -1,32 +1,35 @@ Command explanations -patch -Np1 -i ../gcc-3.2-nofixincludes-2.patch: -This prevents the fixincludes script from running. This is needed because -under normal circumstances the GCC installation will run the fixincludes -scripts which scans your system for header files that need to be fixed. Say -it finds Glibc header files. It will fix them and will end up in -$LFS/static/lib/gcc-lib/i686-pc-linux-gnu/3.2. Later on in chapter 6 you -will install Glibc which will install header files in /usr/include. Next -you will install other programs which will use Glibc headers. GCC will look -in /static/lib/gcc-lib before looking in /usr/include, whichhas the result -of Glibc header files from your host distribution being found and used which -are probably incompatible with the Glibc version actually in use on the LFS -system. - --prefix=/static: This is NOT a typo. GCC hard 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. -echo "#define HAVE_GAS_HIDDEN 1": -This defines the .hidden assembler directive so that we don't build -a faulty Glibc later on. +--with-as and --with-ld: GCC can be +miscompiled if your host distribution's Binutils package is quite old. We +need a good working static GCC until we reinstall GCC later in chapter 6. +So by using as and ld from the +Binutils package we just compiled we ensure that GCC will work +correctly. make BOOT_LDFLAGS="-static": This is the equivalent to make LDFLAGS="-static" as we use with other packages to compile them statically. +make install-no-fixedincludes: +This prevents the fixed header files from being installed. This is needed +because under normal circumstances the GCC installation will run the +fixincludes scripts which scans your system for header files that need to be +fixed. Say it finds Glibc header files. It will fix them and will end up in +$LFS/static/lib/gcc-lib/i686-pc-linux-gnu/ Later on in chapter 6 you +will install Glibc which will install header files in /usr/include. Next +you will install other programs which will use Glibc headers. GCC will look +in /static/lib/gcc-lib before looking in /usr/include, which has the result +of Glibc header files from your host distribution being found and used which +are probably incompatible with the Glibc version actually in use on the LFS +system. + ln -s gcc $LFS/static/bin/cc: This creates the $LFS/static/bin/gcc symlink, which some packages need. diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index add033ae3..99104c393 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -16,14 +16,14 @@ been warned. Install GCC by running the following commands: -patch -Np1 -i ../gcc-&gcc-patch-version;-nofixincludes-2.patch && -mkdir ../gcc-build && +mkdir ../gcc-build && cd ../gcc-build && ../gcc-&gcc-version;/configure --prefix=/static \ -   --disable-nls --disable-shared && -echo "#define HAVE_GAS_HIDDEN 1" >> gcc/auto-host.h && +   --disable-nls --disable-shared \ +   --with-as=$LFS/static/bin/as \ +   --with-ld=$LFS/static/bin/ld && make BOOT_LDFLAGS="-static" bootstrap && -make prefix=$LFS/static install && +make prefix=$LFS/static install-no-fixedincludes && ln -s gcc $LFS/static/bin/cc diff --git a/index.xml b/index.xml index 44e6ab5f3..b9efea5f5 100644 --- a/index.xml +++ b/index.xml @@ -4,8 +4,8 @@ - - + + -- cgit v1.2.3-54-g00ecf