Changeset 3f4c0f41 for chapter06

Timestamp:

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

Author:

Xℹ Ruoyao <xry111@…>

Branches:

ml-11.0, multilib

Children:

8144b71

Parents:

714599f

git-author:

Thomas Trepl <thomas@…> (04/19/2019 05:07:48 AM)

git-committer:

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

Message:

Apply upstream changes
Fix invalid name in 5.7 at mx32 sanity check

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

Location:

chapter06

Files:

• createfiles.xml (modified) (3 diffs)
• creatingdirs.xml (modified) (2 diffs)

chapter06/createfiles.xml

@@ -45 +45 @@
 ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
 
-install -vdm755 /usr/lib/pkgconfig
-
 ln -sv bash /bin/sh</userinput></screen>
 
@@ -52 +50 @@
 ln -sv /tools/lib32/libgcc_s.so{,.1}               /usr/lib32
 ln -sv /tools/lib32/libstdc++.{a,so{,.6}}          /usr/lib32
-install -vdm755 /usr/lib32/pkgconfig
 </userinput>
 <userinput arch="ml_x32,ml_all">
@@ -58 +55 @@
 ln -sv /tools/libx32/libstdc++.{a,so{,.6}}         /usr/libx32
 ln -sv /usr/libx32 /
-install -vdm755 /usr/libx32/pkgconfig
 </userinput></screen>
 

chapter06/creatingdirs.xml

@@ -23 +23 @@
 mkdir -v  /usr/libexec
 mkdir -pv /usr/{,local/}share/man/man{1..8}
+mkdir -v  /usr/lib/pkgconfig
 
 case $(uname -m) in
@@ -46 +47 @@
 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</userinput>
-<userinput arch="ml_x32,ml_all">mkdir -pv /usr/libx32</userinput></screen>
+<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
+install -vdm755 /usr/libx32/pkgconfig</userinput></screen>
 
   <para>Directories are, by default, created with permission mode 755, but