Ver código fonte

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
Pierre Labastie 3 anos atrás
pai
commit
fe039b5f78
3 arquivos alterados com 39 adições e 5 exclusões
  1. 10 0
      chapter01/changelog.xml
  2. 26 2
      chapter06/ncurses.xml
  3. 3 3
      general.ent

+ 10 - 0
chapter01/changelog.xml

@@ -42,6 +42,16 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     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>

+ 26 - 2
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

+ 3 - 3
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; -->