Changeset be00729f for chapter06

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

15fd2f2

Parents:

b2c61c6

git-author:

Thomas Trepl <thomas@…> (07/27/2019 11:23:07 AM)

git-committer:

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

Message:

MultiLib: Merge changes from trunk

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

Location:

chapter06

Files:

• bc.xml (modified) (5 diffs)
• binutils.xml (modified) (2 diffs)
• eudev.xml (modified) (1 diff)
• ninja.xml (modified) (1 diff)
• systemd.xml (modified) (7 diffs)

chapter06/bc.xml

@@ -41 +41 @@
   <sect2 role="installation">
     <title>Installation of Bc</title>
-
+<!--
     <para>First, change an internal script to use <command>sed</command> instead 
     of <command>ed</command>:</para>
@@ -70 +70 @@
 
 <screen><userinput remap="pre">sed -i -e '/flex/s/as_fn_error/: ;; # &amp;/' configure</userinput></screen>
-
+-->
     <para>Prepare Bc for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/usr           \
-            --with-readline         \
-            --mandir=/usr/share/man \
-            --infodir=/usr/share/info</userinput></screen>
+<!--
+<screen><userinput remap="configure">./configure - -prefix=/usr           \
+            - -with-readline         \
+            - -mandir=/usr/share/man \
+            - -infodir=/usr/share/info</userinput></screen>
+-->
+<screen><userinput remap="configure">PREFIX=/usr CC=gcc CFLAGS="-std=c99" ./configure.sh -G -O3</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
-
+<!--
       <varlistentry>
-        <term><parameter>--with-readline</parameter></term>
+        <term><parameter>- -with-readline</parameter></term>
         <listitem>
           <para>This option tells Bc to use the <filename
@@ -90 +92 @@
         </listitem>
       </varlistentry>
+-->
+      <varlistentry>
+        <term><parameter>CC=gcc CFLAGS="-std=c99"</parameter></term>
+        <listitem>
+          <para>These parameters specify the compiler and C standard to use.</para>
+        </listitem>
+      </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-O3</parameter></term>
+        <listitem>
+          <para>Specify the optimization to use.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-G</parameter></term>
+        <listitem>
+          <para>Omit  parts of the test suite that won't work
+          without a GNU bc present.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
@@ -96 +119 @@
 
 <screen><userinput remap="make">make</userinput></screen>
-
+<!--
     <para>To test bc, run the commands below. There is quite a bit of output,
     so you may want to redirect it to a file. There are a very small percentage
@@ -103 +126 @@
 
 <screen><userinput remap="test">echo "quit" | ./bc/bc -l Test/checklib.b</userinput></screen>
+-->
+
+    <para>To test bc, run:</para>
+
+<screen><userinput remap="test">make test</userinput></screen>
+
 
     <para>Install the package:</para>

chapter06/binutils.xml

@@ -57 +57 @@
 <screen><computeroutput>The system has no more ptys.
 Ask your system administrator to create more.</computeroutput></screen>
+
+    <para>Now remove one test that prevents the tests from running
+    to completion:</para>
+
+<screen><userinput remap="pre">sed -i '/@\tincremental_copy/d' gold/testsuite/Makefile.in</userinput></screen>
 
     <para>The Binutils documentation recommends building Binutils 
@@ -153 +158 @@
 <screen><userinput remap="test">make -k check</userinput></screen>
 
-    <para>One test, debug_msg.sh, is known to fail.</para>
+    <para>The PC-relative offset test and  
+    the debug_msg.sh test may fail in the LFS environment.</para>
 
     <para>Install the package:</para>

chapter06/eudev.xml

@@ -105 +105 @@
     environment:</para>
 
-<screen><userinput remap="install">tar -xvf ../&udev-lfs-version;.tar.bz2
+<screen><userinput remap="install">tar -xvf ../&udev-lfs-version;.tar.xz
 make -f &udev-lfs-version;/Makefile.lfs install</userinput></screen>
 

chapter06/ninja.xml

@@ -89 +89 @@
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">python3 configure.py
-./ninja ninja_test
+<screen><userinput remap="test">./ninja ninja_test
 ./ninja_test --gtest_filter=-SubprocessTest.SetWithLots</userinput></screen>
 

chapter06/systemd.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of systemd</title>
-    <!--
-    <para>Apply a patch to fix two critical security vulnerabilities:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-240-security_fixes-2.patch</userinput></screen>
-    -->
 
     <para>Create a symlink to work around missing xsltproc:</para>
@@ -71 +66 @@
 <screen><userinput remap="pre">sed -i 's/GROUP="render", //' rules/50-udev-default.rules.in</userinput></screen>
 
+<!-- EDITORS NOTE: At the next systemd release, see if the CFLAGS can be removed. -->
+
     <para>Prepare systemd for compilation:</para>
 
-    <screen><userinput remap="configure">mkdir -p build
+<screen><userinput remap="configure">mkdir -p build
 cd       build
 
 PKG_CONFIG_PATH="/usr/lib/pkgconfig:/tools/lib/pkgconfig" \
 LANG=en_US.UTF-8                   \
+CFLAGS+="-Wno-format-overflow"     \
 meson --prefix=/usr                \
       --sysconfdir=/etc            \
@@ -86 +84 @@
       -Dfirstboot=false            \
       -Dinstall-tests=false        \
-      -Dkill-path=/bin/kill        \
       -Dkmod-path=/bin/kmod        \
       -Dldconfig=false             \
@@ -97 +94 @@
       -Dumount-path=/bin/umount    \
       -Db_lto=false                \
+      -Drpmmacrosdir=no            \
       ..</userinput></screen>
 
@@ -175 +173 @@
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-Drpmmacrosdir=no</parameter></term>
+        <listitem>
+          <para>This switch disables installation of RPM Macros
+          for use with systemd because LFS does not support RPM.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
@@ -189 +194 @@
 <screen><userinput remap="install">LANG=en_US.UTF-8 ninja install</userinput></screen>
 
-    <para>Remove an unnecessary directory and file:</para>
-
-<screen><userinput remap="install">rm -rfv /usr/lib/rpm
-rm -f /usr/bin/xsltproc</userinput></screen>
+    <para>Remove an unnecessary symbolic link:</para>
+
+<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
 
     <para>Create the <filename>/etc/machine-id</filename> file needed by
@@ -198 +202 @@
 
 <screen><userinput remap="adjust">systemd-machine-id-setup</userinput></screen>
+
+    <para>Remove symbolic links to Util-Linux libraries:</para>
+
+<screen><userinput remap="adjust">rm -fv /usr/lib/lib{blkid,uuid,mount}.so*</userinput></screen>
 
     <para>Prevent systemd from creating <filename>/run/nologin</filename>