Changeset 9c31d62 for chapter06

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

b6b9286

Parents:

0aaf6a31

git-author:

Thomas Trepl <thomas@…> (10/19/2019 05:40:04 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@11687 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Location:

chapter06

Files:

• binutils.xml (modified) (1 diff)
• chapter06.xml (modified) (2 diffs)
• python.xml (modified) (2 diffs)

chapter06/binutils.xml

@@ -158 +158 @@
 <screen><userinput remap="test">make -k check</userinput></screen>
 
-    <para>The PC-relative offset test and  
-    the debug_msg.sh test may fail in the LFS environment.</para>
+    <para>The ver_test_pr16504.sh test is known to fail.</para>
 
     <para>Install the package:</para>

chapter06/chapter06.xml

@@ -36 +36 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="isl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
@@ -41 +43 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>

chapter06/python.xml

@@ -90 +90 @@
 
 <screen><userinput remap="install">make install
-chmod -v 755 /usr/lib/libpython&python-minor;m.so
+chmod -v 755 /usr/lib/libpython&python-minor;.so
 chmod -v 755 /usr/lib/libpython3.so
-ln -sfv pip3.7 /usr/bin/pip3</userinput></screen>
+ln -sfv pip&python-minor; /usr/bin/pip3</userinput></screen>
 
     <variablelist>
       <title>The meaning of the install commands:</title>
-<!-- ======  Change 7m if Python minor version changes ======= -->
-    <varlistentry>
-      <term><command>chmod -v 755 /usr/lib/libpython3.{7m.,}so</command></term>
+<!-- ======  Change 8m if Python minor version changes ======= -->
+    <varlistentry>
+      <term><command>chmod -v 755 /usr/lib/libpython3.{8.,}so</command></term>
       <listitem>
         <para>Fix permissions for libraries to be consistent with other
@@ -147 +147 @@
         </seg>
         <seg>
-          libpython&python-minor;m.so and libpython3.so
+          libpython&python-minor;.so and libpython3.so
         </seg>
         <seg>
-          /usr/include/python&python-minor;m, /usr/lib/python3 and
+          /usr/include/python&python-minor;, 
+          /usr/lib/python3, and
           /usr/share/doc/python-&python-version;
         </seg>