Browse Source

Cleaner separation of multilib instructions

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11576 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Thomas Trepl 6 years ago
parent
commit
eeb2e293ff
1 changed files with 12 additions and 10 deletions
  1. 12 10
      chapter06/createfiles.xml

+ 12 - 10
chapter06/createfiles.xml

@@ -39,7 +39,7 @@
   will be replaced by real files throughout the course of this chapter after the
   will be replaced by real files throughout the course of this chapter after the
   software has been installed:</para>
   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/bin/{env,install,perl,printf}         /usr/bin
 ln -sv /tools/lib/libgcc_s.so{,.1}                  /usr/lib
 ln -sv /tools/lib/libgcc_s.so{,.1}                  /usr/lib
 ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
 ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
@@ -47,16 +47,18 @@ ln -sv /tools/lib/libstdc++.{a,so{,.6}}             /usr/lib
 install -vdm755 /usr/lib/pkgconfig
 install -vdm755 /usr/lib/pkgconfig
 
 
 ln -sv bash /bin/sh</userinput></screen>
 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
 <!--for lib in blkid lzma mount uuid
 do
 do