Changeset 4ea78e0 for chapter08

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

d7e0db5

Parents:

032dc4e8

git-author:

Thomas Trepl <thomas@…> (08/14/2020 03:04:02 AM)

git-committer:

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

Message:

Merge changes from trunk to multilib

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

Location:

chapter08

Files:

• check.xml (modified) (2 diffs)
• gcc.xml (modified) (1 diff)
• kbd.xml (modified) (1 diff)
• perl.xml (modified) (1 diff)
• systemd.xml (modified) (3 diffs)

chapter08/check.xml

@@ -43 +43 @@
     <para>Prepare Check for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>
 
     <para>Build the package:</para>
@@ -72 +72 @@
       <seglistitem>
         <seg>checkmk</seg>
-        <seg>libcheck.{a,so}</seg>
+        <seg>libcheck.so</seg>
       </seglistitem>
     </segmentedlist>

chapter08/gcc.xml

@@ -144 +144 @@
 
     <para>Additionally the following tests related to the following files
-    are kown to fail with glibc-2.32: asan_test.C, co-ret-17-void-ret-coro.C, 
+    are known to fail with glibc-2.32: asan_test.C, co-ret-17-void-ret-coro.C, 
     pr95519-05-gro.C, pr80166.c.</para>
 

chapter08/kbd.xml

@@ -88 +88 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
+
+    <para>Remove an internal library installed unintentionally:</para>
+
+<screen><userinput remap="install">rm -v /usr/lib/libtswrap.{a,la,so*}</userinput></screen>
 
     <note>

chapter08/perl.xml

@@ -59 +59 @@
              -Dprefix=/usr                                \
              -Dvendorprefix=/usr                          \
-             -Dprivlib=/usr/share/perl5/core_perl         \
-             -Darchlib=/usr/lib/perl5/&perl-version-min;/core_perl      \
-             -Dsitelib=/usr/share/perl5/site_perl         \
-             -Dsitearch=/usr/lib/perl5/&perl-version-min;/site_perl     \
+             -Dprivlib=/usr/lib/perl5/5.32/core_perl      \
+             -Darchlib=/usr/lib/perl5/5.32/core_perl      \
+             -Dsitelib=/usr/lib/perl5/5.32/site_perl      \
+             -Dsitearch=/usr/lib/perl5/5.32/site_perl     \
              -Dvendorlib=/usr/share/perl5/vendor_perl     \
-             -Dvendorarch=/usr/lib/perl5/&perl-version-min;/vendor_perl \
+             -Dvendorarch=/usr/lib/perl5/5.32/vendor_perl \
              -Dman1dir=/usr/share/man/man1                \
              -Dman3dir=/usr/share/man/man3                \

chapter08/systemd.xml

@@ -41 +41 @@
     <title>Installation of systemd</title>
 
+<!--
     <para>First, apply a patch to fix the build with GCC-10 and fix a segfault:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-2.patch</userinput></screen>
+-->
 
     <para>Create a symlink to work around the xsltproc command not being installed:</para>
@@ -55 +57 @@
     <para>Remove tests that cannot be built in chroot:</para>
 
-<screen><userinput remap="pre">sed '179,$ d' -i src/resolve/meson.build</userinput></screen>
+<screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
 
     <para>Remove an unneeded group,
@@ -378 +380 @@
         /etc/sysctl.d, /etc/systemd, /etc/tmpfiles.d, /etc/udev,
         /etc/xdg/systemd, /lib/systemd, /lib/udev, /usr/include/systemd,
-        /usr/lib/binfmt.d, /usr/lib/kernel, /usr/lib/modules-load.d,
-        /usr/lib/sysctl.d, /usr/lib/systemd, /usr/lib/tmpfiles.d,
+        /usr/lib/binfmt.d, /usr/lib/environment.d, /usr/lib/kernel, 
+        /usr/lib/modules-load.d, /usr/lib/sysctl.d, /usr/lib/systemd, 
+        /usr/lib/tmpfiles.d,
         /usr/share/doc/systemd-&systemd-version;, /usr/share/factory,
         /usr/share/systemd, /var/lib/systemd, and /var/log/journal</seg>