Changeset ffce215

Timestamp:

04/11/2019 01:22:24 PM (4 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib-10.1

Children:

60970f9

Parents:

058c7ef

Message:

Cleaner separation of multilib instructions

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

File:

• chapter06/createfiles.xml (modified) (2 diffs)

chapter06/createfiles.xml

@@ -40 +40 @@
   software has been installed:</para>
 
-<screen arch="default"><userinput>ln -sv /tools/bin/{bash,cat,chmod,dd,echo,ln,mkdir,pwd,rm,stty,touch} /bin
+<screen><userinput>ln -sv /tools/bin/{bash,cat,chmod,dd,echo,ln,mkdir,pwd,rm,stty,touch} /bin
 ln -sv /tools/bin/{env,install,perl,printf}         /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1}                  /usr/lib
@@ -48 +48 @@
 
 ln -sv bash /bin/sh</userinput></screen>
-<screen arch="ml_32,ml_x32,ml_all"><userinput>ln -sv /tools/bin/{bash,cat,chmod,dd,echo,ln,mkdir,pwd,rm,stty,touch} /bin
-ln -sv /tools/bin/{env,install,perl,printf}         /usr/bin
-for lib in lib{</userinput><userinput arch="ml_32,ml_all">,32</userinput><userinput arch="ml_x32,ml_all">,x32</userinput><userinput>}; do
-  ln -sv /tools/$lib/libgcc_s.so{,.1}               /usr/$lib
-  ln -sv /tools/$lib/libstdc++.{a,so{,.6}}          /usr/$lib
-done
-</userinput><userinput arch="ml_x32,ml_all">ln -sv /usr/libx32 /</userinput><userinput>
-install -vdm755 /usr/lib{</userinput><userinput arch="ml_32,ml_all">,32</userinput><userinput arch="ml_x32,ml_all">,x32</userinput><userinput>}/pkgconfig
-
-ln -sv bash /bin/sh</userinput></screen>
+
+<screen arch="ml_32,ml_x32,ml_all"><userinput arch="ml_32,ml_all">
+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">
+ln -sv /tools/libx32/libgcc_s.so{,.1}              /usr/libx32
+ln -sv /tools/libx32/libstdc++.{a,so{,.6}}         /usr/libx32
+ln -sv /usr/libx32 /
+install -vdm755 /usr/libx32/pkgconfig
+</userinput></screen>
 
 <!--for lib in blkid lzma mount uuid