From dc19fb6e8ee98149ca0e9971bbf62f8fb418197e Mon Sep 17 00:00:00 2001 From: Greg Schafer Date: Sun, 21 Sep 2003 01:40:43 +0000 Subject: [PATCH] Chapter 5 - GCC Pass 2: Updated to gcc-3.3.1-specs-2.patch. Ncurses: added --enable-overwrite and description. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2853 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 6 +++++- chapter04/chapter04.xml | 2 +- chapter05/gcc-pass2-inst.xml | 11 ++++++----- chapter05/ncurses-inst.xml | 9 +++++++-- entities/gcc.ent | 2 +- index.xml | 4 ++-- 6 files changed, 22 insertions(+), 12 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 122932489..05b553a47 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -58,7 +58,7 @@ gcc-2.95.3-2.patch gcc-2.95.3-returntype-fix.patch gcc-3.3.1-no_fixincludes-2.patch -gcc-3.3.1-specs-1.patch +gcc-&gcc-specs-version;.patch gcc-3.3.1-suppress-libiberty.patch grub-0.93 grub-0.93-gcc33-1.patch @@ -94,6 +94,10 @@ +September 20th, 2003 [greg]: Chapter 5 - GCC Pass 2: Updated +to gcc-3.3.1-specs-2.patch. Ncurses: added --enable-overwrite and description. + + September 19th, 2003 [jeremy]: Corrected bash tags for proper use of the +h flag to bash diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml index 67890ef5b..93c0c9155 100644 --- a/chapter04/chapter04.xml +++ b/chapter04/chapter04.xml @@ -260,7 +260,7 @@ GCC-2 Return-type Patch: GCC No Fixincludes Patch: GCC Specs Patch: - + GCC Suppress Libiberty Patch: diff --git a/chapter05/gcc-pass2-inst.xml b/chapter05/gcc-pass2-inst.xml index c9eb1dd25..81a1b2dbf 100644 --- a/chapter05/gcc-pass2-inst.xml +++ b/chapter05/gcc-pass2-inst.xml @@ -34,11 +34,12 @@ searched before the system include directory, resulting in GCC finding the fixed headers from the host system, which would most likely not match the Glibc version actually used for the LFS system. -The last patch changes GCC's default location of the dynamic linker -(ld). Patching now rather than adjusting the specs file after installation -ensures that our new dynamic linker gets used during the actual build of GCC. -That is, all the final (and temporary) binaries created during the build will -link against the new Glibc. +The last patch changes GCC's default location of the dynamic linker +(typically ld-linux.so.2). It also removes /usr/include + from GCC's include search path. Patching now rather than adjusting +the specs file after installation ensures that our new dynamic linker gets used +during the actual build of GCC. That is, all the final (and temporary) binaries +created during the build will link against the new Glibc. Create a separate build directory again: diff --git a/chapter05/ncurses-inst.xml b/chapter05/ncurses-inst.xml index 7b030edcf..938be653f 100644 --- a/chapter05/ncurses-inst.xml +++ b/chapter05/ncurses-inst.xml @@ -15,7 +15,7 @@ deprecated headers. Now prepare Ncurses to be compiled: ./configure --prefix=/tools --with-shared \ -    --without-debug --without-ada +    --without-debug --without-ada --enable-overwrite The meaning of the configure options: @@ -24,7 +24,12 @@ deprecated headers. to build its Ada bindings, even if an Ada compiler is installed on the host. This must be done because once we enter the chroot environment, Ada will no longer be available. - + +--enable-overwrite: This tells Ncurses +to install its header files into /tools/include +instead of /tools/include/ncurses to +ensure that other packages can find the Ncurses headers successfully. + Compile the programs and libraries: diff --git a/entities/gcc.ent b/entities/gcc.ent index 21b146f39..c41eaf2fe 100644 --- a/entities/gcc.ent +++ b/entities/gcc.ent @@ -17,7 +17,7 @@ - + diff --git a/index.xml b/index.xml index 916fd9c01..c0d19c42e 100644 --- a/index.xml +++ b/index.xml @@ -3,8 +3,8 @@ "/usr/share/docbook/docbookx.dtd" [ - - + +