From 1e472fb9acf1c14f1e13c824b6ca89e1198410be Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Wed, 29 Mar 2017 02:13:40 +0000 Subject: Move realline to be before bc in Cahpater 6. Update to linux-4.10.6. Update to pkg-config-0.29.2. Update to tzdata-2017b. Add option -Dusethreads to perl in Chapter 6. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11212 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 25 +++++++++++++++++++++++++ chapter01/whatsnew.xml | 4 ++-- chapter06/bc.xml | 8 ++++++++ chapter06/chapter06.xml | 2 +- chapter06/perl.xml | 10 +++++++++- chapter06/readline.xml | 9 ++++----- general.ent | 6 +++--- packages.ent | 16 ++++++++-------- 8 files changed, 60 insertions(+), 20 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index dd1206dde..687dc29a9 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -42,6 +42,31 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2017-03-28 + + + [bdubbs] - Move realline to be before bc in Cahpater 6. Fixes + #4068. + + + [bdubbs] - Update to linux-4.10.6. Fixes + #4065. + + + [bdubbs] - Update to pkg-config-0.29.2. Fixes + #4066. + + + [bdubbs] - Update to tzdata-2017b. Fixes + #4067. + + + [bdubbs] - Add option -Dusethreads to perl in Chapter 6. + + + + 2017-03-25 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 5231d4e9a..461ce2674 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -182,9 +182,9 @@ - + diff --git a/chapter06/bc.xml b/chapter06/bc.xml index 7f9373e52..31794bb80 100644 --- a/chapter06/bc.xml +++ b/chapter06/bc.xml @@ -45,6 +45,14 @@ patch -Np1 -i ../&bc-memory-leak-patch; + Create a temporary symbolic link so the package can find + the readline library and confirm that its required libncurses + library is available. Even though the libraries are in /tools/lib + at this point, the system will use /usr/lib at the end of + this chapter. + +ln -sv /tools/lib/libncursesw.so /usr/lib/libncurses.so + Prepare Bc for compilation: ./configure --prefix=/usr \ diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index f48b1ee62..8f4a8f46f 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -23,6 +23,7 @@ + @@ -43,7 +44,6 @@ - diff --git a/chapter06/perl.xml b/chapter06/perl.xml index 76b0af2cf..cf1b1b2b2 100644 --- a/chapter06/perl.xml +++ b/chapter06/perl.xml @@ -71,7 +71,8 @@ export BUILD_BZIP2=0 -Dman1dir=/usr/share/man/man1 \ -Dman3dir=/usr/share/man/man3 \ -Dpager="/usr/bin/less -isR" \ - -Duseshrplib + -Duseshrplib \ + -Dusethreads The meaning of the configure options: @@ -109,6 +110,13 @@ export BUILD_BZIP2=0 + + -Dusethreads + + Build perl with support for threads. + + + Compile the package: diff --git a/chapter06/readline.xml b/chapter06/readline.xml index 98be029db..d7f27b334 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -57,17 +57,16 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install Compile the package: -make SHLIB_LIBS=-lncurses +make SHLIB_LIBS="-L/tools/lib -lncursesw" The meaning of the make option: - SHLIB_LIBS=-lncurses + SHLIB_LIBS="-L/tools/lib -lncursesw" This option forces Readline to link against the - libncurses (really, - libncursesw) library. + libncursesw library. @@ -77,7 +76,7 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install Install the package: -make SHLIB_LIBS=-lncurses install +make SHLIB_LIBS="-L/tools/lib -lncurses" install Now move the dynamic libraries to a more appropriate location and fix up some symbolic links: diff --git a/general.ent b/general.ent index 8afce0f5a..4db180558 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index 71fa78d83..938bc1b2d 100644 --- a/packages.ent +++ b/packages.ent @@ -392,12 +392,12 @@ - + - + - +