aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Labastie <pieere@linuxfromscratch.org>2020-07-06 20:47:01 +0000
committerPierre Labastie <pieere@linuxfromscratch.org>2020-07-06 20:47:01 +0000
commitfe039b5f7846615590c84b03ba8fe05be115e0bf (patch)
treef2725b4236b41db2e093890d509d92fc755d99da
parentb6c0d12e38613afd4b2096808aefb29006632d22 (diff)
Match ncurses chapter 6 to what is done in chapter 8, and add explanations
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11994 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter06/ncurses.xml28
-rw-r--r--general.ent6
3 files changed, 39 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 1bcc2cada..c08d00ea0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,16 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
+ <para>2020-07-06</para>
+ <itemizedlist>
+ <listitem>
+ <para>[pierre] - Change chapter 6 ncurses so that it matches
+ what is done in chapter 8, and add explanations.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2020-07-04</para>
<itemizedlist>
<listitem>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 5c48b3619..36513603c 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -120,9 +120,33 @@ popd</userinput></screen>
<screen><userinput remap="make">make</userinput></screen>
<para>Install the package:</para>
-<!-- TODO: check and document -->
+
<screen><userinput remap="install">make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install
-ln -s libncursesw.so $LFS/usr/lib/libncurses.so</userinput></screen>
+echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen>
+
+ <variablelist>
+ <title>The meaning of the install options:</title>
+
+ <varlistentry>
+ <term><parameter>TIC_PATH=$(pwd)/build/progs/tic</parameter></term>
+ <listitem>
+ <para>We need to pass the path of the just built
+ <command>tic</command> able to run on the building machine, so that
+ the terminal database can be created without errors.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><command>echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</command></term>
+ <listitem>
+ <para>The <filename>libncurses.so</filename> library is needed by
+ a few packages we will build soon. We create this small linker
+ script, as this is what is done in <xref
+ linkend="chapter-building-system"/>.</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
<para>Move the shared libraries to the
<filename class="directory">/lib</filename> directory, where they are
diff --git a/general.ent b/general.ent
index f119819fa..362f9de7b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20200704">
+<!ENTITY version "SVN-20200706">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
-<!ENTITY versiond "20200704-systemd">
+<!ENTITY versiond "20200706-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "July 4th, 2020">
+<!ENTITY releasedate "July 6th, 2020">
<!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->