Changeset c7e74d6 for chapter06

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

d4248df

Parents:

6fc519e

git-author:

Thomas Trepl <thomas@…> (03/15/2020 10:56:46 AM)

git-committer:

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

Message:

MultiLib: Merge changes from trunk

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

Location:

chapter06

Files:

• creatingdirs.xml (modified) (2 diffs)
• gcc.xml (modified) (1 diff)
• gmp.xml (modified) (1 diff)
• libcap.xml (modified) (2 diffs)
• man-db.xml (modified) (1 diff)

chapter06/creatingdirs.xml

@@ -14 +14 @@
   standard directory tree by issuing the following commands:</para>
 
-<screen arch="default"><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig},home,lib/firmware,mnt,opt}
+<screen><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig},home,lib/firmware,mnt,opt}
 mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
 install -dv -m 0750 /root
@@ -33 +33 @@
 ln -sv /run/lock /var/lock
 mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput></screen>
-<screen arch="ml_32,ml_x32,ml_all"><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig,ld.so.conf.d},home,lib/firmware,mnt,opt}
-mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
-install -dv -m 0750 /root
-install -dv -m 1777 /tmp /var/tmp
-mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
-mkdir -pv /usr/{,local/}share/{color,dict,doc,info,locale,man}
-mkdir -v  /usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -v  /usr/libexec
-mkdir -pv /usr/{,local/}share/man/man{1..8}
-mkdir -v  /usr/lib/pkgconfig
-mkdir -v /lib64
-mkdir -v /var/{log,mail,spool}
-ln -sv /run /var/run
-ln -sv /run/lock /var/lock
-mkdir -pv /var/{opt,cache,lib/{color,misc,locate},local}</userinput>
-<userinput arch="ml_32,ml_all">mkdir -pv /usr/lib32
+<screen arch="ml_32,mlx32,ml_all"><userinput arch="ml_32,ml_all">mkdir -pv /usr/lib32
 install -vdm755 /usr/lib32/pkgconfig</userinput>
 <userinput arch="ml_x32,ml_all">mkdir -pv /usr/libx32

chapter06/gcc.xml

@@ -58 +58 @@
     -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
     -i.orig gcc/config/i386/t-linux64</userinput></screen>
-
-    <para>Remove the symlink created earlier as the final gcc includes will be
-    installed here:</para>
-
-<screen><userinput remap="pre">rm -f /usr/lib/gcc</userinput></screen>
-
-    <!-- Following patch might be obsolete with gcc >= 8.2.1 --> 
-<!--
-    <para>Fix an issue with isl-&isl-version;:</para>
-
-<screen><userinput remap="pre">sed -e "/#include &lt;isl\/schedule_node.h&gt;/ a#include &lt;isl/id.h&gt;\n#include &lt;isl/space.h&gt;" \
-    -i gcc/graphite.h</userinput></screen>
--->
-
-   <para>
-      As in gcc-pass2, fix a problem introduced by Glibc-2.31:
-    </para>
-
-<screen><userinput remap="pre">sed -e '1161 s|^|//|' \
-    -i libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc</userinput></screen>
 
     <para>The GCC documentation recommends building GCC in a dedicated build directory:</para>

chapter06/gmp.xml

@@ -109 +109 @@
     --build=x86_64-unknown-linux-gnu and rebuilt.</para></caution>
 
-    <para>Ensure that all 190 tests in the test suite passed.
+    <para>Ensure that all 197 tests in the test suite passed.
     Check the results by issuing the following command:</para>
 

chapter06/libcap.xml

@@ -44 +44 @@
     <title>Installation of Libcap</title>
 
-    <para>Prevent two static libraries from being installed:</para>
-
-<screen><userinput remap="pre">sed -i '/install.*STA...LIBNAME/d' libcap/Makefile</userinput></screen>
+    <para>Prevent a static library from being installed:</para>
+
+<screen><userinput remap="pre">sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile</userinput></screen>
 
     <para>Compile the package:</para>
@@ -70 +70 @@
 <screen><userinput remap="test">make test</userinput></screen>
 
-    <para>Install the package:</para>
+    <para>Install the package and do some cleanup:</para>
 
 <screen><userinput remap="install">make lib=lib install
-chmod -v 755 /lib/libcap.so.&libcap-version;</userinput></screen>
+chmod -v 755 /lib/libcap.so.&libcap-version;
+mv -v /lib/libpsx.a /usr/lib
+rm -v /lib/libcap.so
+ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so</userinput></screen>
 
   </sect2>

chapter06/man-db.xml

@@ -90 +90 @@
         <listitem>
           <para>This makes the system-wide cache files be owned by user
-          bin.</para>
+          <systemitem class="username">bin</systemitem>.</para>
         </listitem>
       </varlistentry>