Changeset ceebda5 for chapter08

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

61385ca

Parents:

eef83ea

git-author:

Thomas Trepl <thomas@…> (03/30/2021 08:47:28 AM)

git-committer:

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

Message:

Merge changes from trunk to multilib

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

Location:

chapter08

Files:

• autoconf.xml (modified) (2 diffs)
• bc.xml (modified) (2 diffs)
• binutils.xml (modified) (2 diffs)
• coreutils.xml (modified) (1 diff)
• file.xml (modified) (1 diff)
• gmp.xml (modified) (1 diff)
• grub.xml (modified) (2 diffs)
• meson.xml (modified) (1 diff)
• python.xml (modified) (1 diff)
• systemd.xml (modified) (4 diffs)

chapter08/autoconf.xml

@@ -66 +66 @@
     Autoconf can be re-tested after Automake has been installed.  In addition,
     two tests fail due to changes in libtool-2.4.3 and later.</para>
-
+-->
     <note><para>The test time for autoconf can be reduced significantly on a
     system with multiple cores.  To do this, append
@@ -72 +72 @@
     instance, using -j4 can reduce the test time by over 60
     percent.</para></note>
--->
+
     <para>Install the package:</para>
 

chapter08/bc.xml

@@ -44 +44 @@
     <para>Prepare Bc for compilation:</para>
 
-<screen><userinput remap="configure">PREFIX=/usr CC=gcc ./configure.sh -G -O3</userinput></screen>
+<screen><userinput remap="configure">CC=gcc ./configure --prefix=/usr -G -O3</userinput></screen>
 
     <variablelist>
@@ -50 +50 @@
 
       <varlistentry>
-        <term><parameter>CC=gcc"</parameter></term>
+        <term><parameter>CC=gcc</parameter></term>
         <listitem>
-          <para>These parameters specify the compiler to use.</para>
+          <para>This parameter specifies the compiler to use.</para>
         </listitem>
       </varlistentry>

chapter08/binutils.xml

@@ -154 +154 @@
           class="directory">$(exec_prefix)/$(target_alias)</filename>. For
           example, x86_64 machines would expand that to <filename
-          class="directory">/usr/x86_64-unknown-linux-gnu</filename>. Because this is
+          class="directory">/usr/x86_64-pc-linux-gnu</filename>. Because this is
           a custom system, this target-specific directory in <filename
           class="directory">/usr</filename> is not required. <filename
@@ -180 +180 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
+<screen><userinput remap="install">make tooldir=/usr install -j1</userinput></screen>
 
     <para>Remove useless static libraries:</para>

chapter08/coreutils.xml

@@ -195 +195 @@
         <listitem>
           <para>Is an actual command, /usr/bin/[, that is a synonym
-          for the <command>test</command> command.</para>
+          for the <command>test</command> command</para>
           <indexterm zone="ch-system-coreutils lbracket">
             <primary sortas="b-111">[</primary>

chapter08/file.xml

@@ -57 +57 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
+
+    <para><command>/bin/more</command> from util-linux will link to
+    <filename class="libraryfile">libmagic.so</filename>, so the shared
+    library should be moved to <filename class="directory">/lib</filename>,
+    and as a result the
+    <filename class="extension">.so</filename> file in
+    <filename class="directory">/usr/lib</filename> will need to be recreated:</para>
+
+<screen><userinput remap="install">mv -v /usr/lib/libmagic.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libmagic.so) /usr/lib/libmagic.so</userinput></screen>
 
   </sect2>

chapter08/gmp.xml

@@ -107 +107 @@
     applications using the gmp libraries with the message "Illegal
     instruction".  In this case, gmp should be reconfigured with the option
-    --build=x86_64-unknown-linux-gnu and rebuilt.</para></caution>
+    --build=x86_64-pc-linux-gnu and rebuilt.</para></caution>
 
     <para>Ensure that all 197 tests in the test suite passed.

chapter08/grub.xml

@@ -41 +41 @@
     <title>Installation of GRUB</title>
 
-    <para>First, fix an issue introduced by binutils-2.36:</para>
-
-<screen><userinput remap="pre">sed "s/gold-version/&amp; -R .note.gnu.property/" \
-    -i Makefile.in grub-core/Makefile.in</userinput></screen>
-
     <para>Prepare GRUB for compilation:</para>
 
@@ -79 +74 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>The test suite for this packages is not recommended.  Most of
+    the tests depend on packages that are not available in the limited
+    LFS environment. To run the tests anyway, run <command>make check</command>.</para>
 
     <para>Install the package:</para>

chapter08/meson.xml

@@ -64 +64 @@
 
 <screen><userinput remap="install">python3 setup.py install --root=dest
-cp -rv dest/* /</userinput></screen>
+cp -rv dest/* /
+install -vDm644 data/shell-completions/bash/meson /usr/share/bash-completion/completions/meson
+install -vDm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/_meson</userinput></screen>
 
     <variablelist>

chapter08/python.xml

@@ -42 +42 @@
   <sect2 role="installation">
     <title>Installation of Python 3</title>
+
+    <para>First, a header file needs to be fixed:</para>
+
+<screen><userinput remap="pre">sed 's|cpython/||' -i Include/cpython/pystate.h</userinput></screen>
 
     <para>Prepare Python for compilation:</para>

chapter08/systemd.xml

@@ -47 +47 @@
 -->
 
-    <para>First, apply a patch to fix some regressions:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
-
-    <para>Create a symlink to work around the xsltproc command not being installed:</para>
-
-<screen><userinput remap="pre">ln -sf /bin/true /usr/bin/xsltproc</userinput></screen>
-
-    <para>Set up the man pages:</para>
-
-<screen><userinput remap="pre">tar -xf ../systemd-man-pages-&systemd-version;.tar.xz</userinput></screen>
+    <!-- For linux-5.11's API headers changing the rfkill_event structure -->
+    <para>First, apply a patch to fix some regressions and fix functionality
+    with future versions of the kernel:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-2.patch</userinput></screen>
 
     <para>Remove tests that cannot be built in chroot:</para>
@@ -96 +90 @@
       -Dhomed=false                 \
       -Duserdb=false                \
-      -Dman=true                    \
+      -Dman=false                   \
       -Dmode=release                \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
@@ -192 +186 @@
 
       <varlistentry>
+        <term><parameter>-Dman=false</parameter></term>
+        <listitem>
+          <para>Prevent the generation of man pages to avoid extra
+          dependencies.  We will install pre-generated man pages for systemd
+          from a tarball later.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><parameter>-Dmode=release</parameter></term>
         <listitem>
@@ -209 +212 @@
 <screen><userinput remap="install">LANG=en_US.UTF-8 ninja install</userinput></screen>
 
-    <para>Remove an unnecessary symbolic link:</para>
-
-<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
+    <para>Install the man pages:</para>
+
+<screen><userinput remap="install">tar -xf ../../systemd-man-pages-&systemd-man-version;.tar.xz --strip-components=1 -C /usr/share/man</userinput></screen>
 
     <para>Remove a useless directory:</para>