Changeset 3019de7 for chapter06

Timestamp:

03/31/2021 10:41:36 AM (3 years ago)

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

ae39e19

Parents:

c35a3ab

git-author:

Thomas Trepl <thomas@…> (11/17/2019 08:38:59 PM)

git-committer:

Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:36 AM)

Message:

MultiLib: Merge changes from trunk

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/multilib@11700 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• check.xml (modified) (1 diff)
• gettext.xml (modified) (2 diffs)
• systemd.xml (modified) (1 diff)

chapter06/check.xml

@@ -59 +59 @@
     <para>Install the package and fix a script:</para>
 
-    <screen><userinput remap="install">make docdir=/usr/share/doc/check-&check-version; install
+    <screen><userinput remap="install">make docdir=/usr/share/doc/check-&check-version; install &amp;&amp;
 sed -i '1 s/tools/usr/' /usr/bin/checkmk</userinput></screen>
+<!-- Removes a hardcoded call to /tools/bin/gawk at line 1 of checkmk. -->
 
   </sect2>

chapter06/gettext.xml

@@ -105 +105 @@
         ngettext, recode-sr-latin, and xgettext</seg>
         <seg>libasprintf.so, libgettextlib.so, libgettextpo.so,
-        libgettextsrc.so, and preloadable_libintl.so</seg>
+        libgettextsrc.so, libtextstyle.so, and preloadable_libintl.so</seg>
         <seg>/usr/lib/gettext, /usr/share/doc/gettext-&gettext-version;,
         /usr/share/gettext, and /usr/share/gettext-0.19.8</seg>
@@ -403 +403 @@
       </varlistentry>
 
+      <varlistentry id="libtextstyle">
+        <term><filename class="libraryfile">libtextstyle</filename></term>
+        <listitem>
+          <para>Text styling library</para>
+          <indexterm zone="ch-system-gettext libtextstyle">
+            <primary sortas="c-libtextstyle">libtextstyle</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="preloadable_libintl">
         <term><filename class="libraryfile">preloadable_libintl</filename></term>

chapter06/systemd.xml

@@ -44 +44 @@
     of systemd-243.</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-consolidated_fixes-1.patch</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-consolidated_fixes-2.patch</userinput></screen>
 
     <para>Create a symlink to work around missing xsltproc:</para>