From b175687da8cddb861ee6725d52391ee829e10ad8 Mon Sep 17 00:00:00 2001 From: Timothy Bauscher Date: Sun, 11 May 2003 19:12:19 +0000 Subject: More from Zack: Ncurses symlinks fixes, procps removal of XSCPT=, --without-debug for ncurses. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2568 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- README | 2 +- chapter01/changelog.xml | 12 ++++++++++++ chapter04/coreutils-patch.xml | 10 +++++++--- chapter04/gcc-patch.xml | 8 ++++++++ chapter04/gcc.xml | 9 --------- chapter04/packages.xml | 1 + chapter06/coreutils-inst.xml | 11 +++++++++-- chapter06/ncurses-inst.xml | 8 ++++---- chapter06/procps-inst.xml | 8 +------- entities/coreutils.ent | 6 ++++-- 10 files changed, 47 insertions(+), 28 deletions(-) create mode 100644 chapter04/gcc-patch.xml diff --git a/README b/README index 1deb289ee..7ae53fd57 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ XML to HTML: Create a directory in which you want to store the HTML files and cd into that directory. Now run: - mkdir -p chapter0{1,2,3,4,5,6,7,8,9} preface appendix{a,b} && + mkdir -p chapter0{1,2,3,4,5,6,7,8,9} preface appendixa && /usr/bin/openjade -t xml \ -d /usr/share/dsssl/docbook/html/lfs.dsl \ /usr/share/dsssl/docbook/dtds/decls/xml.dcl \ diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index de8f28fcd..197d88e76 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -68,6 +68,18 @@ +May 11th, 2003 [winkie]: Chapter 06 - Installing Ncurses: +Fix up the symlinks so that they follow suit of other library symlinks. +No more weirdness here. + +May 11th, 2003 [winkie]: Chapter 06 - Installing Procps: +Removed XSCPT="" cruft and it's corresponding paragraph. This stuff +isn't needed anymore. + +May 11th, 2003 [winkie]: Chapter 06 - Installing Ncurses: +Pass --without-debug to the configure script. It seems to have gotten +lost at some point. + May 11th, 2003 [timothy]: Chapter 5 & 6 - Installing Bzip2, Installing Zlib: Modified build commands per bug #524. diff --git a/chapter04/coreutils-patch.xml b/chapter04/coreutils-patch.xml index 2ebd8fa61..f0a559b74 100644 --- a/chapter04/coreutils-patch.xml +++ b/chapter04/coreutils-patch.xml @@ -1,3 +1,7 @@ -Coreutils Patch (&coreutils-patch-version;) - &coreutils-patch-size;: - - +Coreutils Uname Patch (&coreutils-uname-patch-version;) - &coreutils-uname-patch-size;: + + + +Coreutils Hostname Patch (&coreutils-hostname-patch-version;) - &coreutils-hostname-patch-size;: + + diff --git a/chapter04/gcc-patch.xml b/chapter04/gcc-patch.xml new file mode 100644 index 000000000..3102617ec --- /dev/null +++ b/chapter04/gcc-patch.xml @@ -0,0 +1,8 @@ +GCC Specs Patch: + + +GCC MMap Test Patch: + + +GCC No Fixincludes Patch: + diff --git a/chapter04/gcc.xml b/chapter04/gcc.xml index bc27a4a88..e54f7f7c0 100644 --- a/chapter04/gcc.xml +++ b/chapter04/gcc.xml @@ -1,11 +1,2 @@ GCC (&gcc-version;) - &gcc-core-size;: - -GCC Specs Patch: - - -GCC MMap Test Patch: - - -GCC No Fixincludes Patch: - diff --git a/chapter04/packages.xml b/chapter04/packages.xml index 6be2490dc..31e839e6d 100644 --- a/chapter04/packages.xml +++ b/chapter04/packages.xml @@ -29,6 +29,7 @@ &c4-gawk; &c4-gawk-patch; &c4-gcc; +&c4-gcc-patch; &c4-gcc-2953; &c4-gettext; &c4-glibc; diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml index 1d2df60b2..f1225d77c 100644 --- a/chapter06/coreutils-inst.xml +++ b/chapter06/coreutils-inst.xml @@ -4,9 +4,16 @@ Installation of Coreutils Normally the functionality of uname is somewhat broken, in that -the -p switch always returns "unknown". This patch fixes that behaviour: +the -p switch always returns "unknown". This patch fixes that behaviour +for Intel architectures: -patch -Np1 -i ../coreutils-&coreutils-patch-version;.patch +patch -Np1 -i ../coreutils-&coreutils-uname-patch-version;.patch + +We do not want Coreutils to install it's version of the hostname +binary, because it is inferior to the version provided by Net-tools. +Prevent the installation of hostname with this patch: + +patch -Np1 -i ../coreutils-&coreutils-hostname-patch-version;.patch Prepare Coreutils to be compiled: diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index 65856f312..8a56f31e4 100644 --- a/chapter06/ncurses-inst.xml +++ b/chapter06/ncurses-inst.xml @@ -7,7 +7,8 @@ Prepare Ncurses to be compiled: -./configure --prefix=/usr --with-shared +./configure --prefix=/usr --with-shared && +    --without-debug Continue with compiling the package: @@ -30,8 +31,7 @@ where they're expected to reside: /lib, a few symlinks are currently pointing towards non-existing files. Recreate those symlinks: -ln -sf libncurses.a /usr/lib/libcurses.a && -ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so && -ln -sf ../../lib/libncurses.so.5 /usr/lib/libcurses.so +ln -sf ../../lib/libncurses.so.5 /usr/lib/libncurses.so && +ln -sf libncurses.so /usr/lib/libcurses.so diff --git a/chapter06/procps-inst.xml b/chapter06/procps-inst.xml index 619457799..c9b8fd8d5 100644 --- a/chapter06/procps-inst.xml +++ b/chapter06/procps-inst.xml @@ -16,13 +16,7 @@ the patch: Finish installing the package: -make XSCPT="" install - -The XSCPT option will set the Makefile -variable XSCPT to an empty value so that XConsole installation is -disabled. Otherwise, make install tries to -copy the file XConsole to /usr/X11R6/lib/X11/app-defaults. That -directory does not exist because X is not installed. +make install diff --git a/entities/coreutils.ent b/entities/coreutils.ent index b1a452a4d..6ca7e383c 100644 --- a/entities/coreutils.ent +++ b/entities/coreutils.ent @@ -19,8 +19,10 @@ - - + + + + -- cgit v1.2.3-54-g00ecf