gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-07-19 18:55:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify instructions for multilib support. Fixes #4453

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11575 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Thomas Trepl 2019-04-11 13:14:59 +00:00
parent a23757bd9c
commit 058c7efa53
3 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chapter05/gcc-pass1.xml
View File

@ -121,16 +121,9 @@ done</userinput></screen>
;;
esac</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-i.orig gcc/config/i386/t-linux64
cat > gcc/config/i386/t-linux64 &lt;&lt;"EOF"
comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
MULTILIB_OSDIRNAMES+= m32=../lib32$(call if_multiarch,:i386-linux-gnu)
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
EOF</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
-i.orig gcc/config/i386/t-linux64</userinput></screen>
<!--
<para>GCC doesn't detect stack protection correctly, which causes problems

13
chapter05/gcc-pass2.xml
View File

@ -96,16 +96,9 @@ esac</userinput></screen>
<para arch="ml_32,ml_x32,ml_all">Change the default directory name for 64-bit
libraries to <quote>lib</quote>:</para>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-i.orig gcc/config/i386/t-linux64
cat > gcc/config/i386/t-linux64 &lt;&lt;"EOF"
comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
MULTILIB_OSDIRNAMES+= m32=../lib32$(call if_multiarch,:i386-linux-gnu)
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
EOF</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \
-i.orig gcc/config/i386/t-linux64</userinput></screen>
<para arch="default">As in the first build of GCC it requires the GMP,
MPFR, and MPC packages. Unpack the tarballs and move them into the

13
chapter06/gcc.xml
View File

@ -54,16 +54,9 @@ esac</userinput></screen>
<para arch="ml_32,ml_x32,ml_all">Change the default directory name for 64-bit
libraries to <quote>lib</quote>:</para>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-i.orig gcc/config/i386/t-linux64
cat &gt; gcc/config/i386/t-linux64 &lt;&lt;"EOF"
comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
MULTILIB_OSDIRNAMES+= m32=../lib32$(call if_multiarch,:i386-linux-gnu)
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
EOF</userinput></screen>
<screen arch="ml_32,ml_x32,ml_all"><userinput remap="pre">sed -e '/m64=/s/lib64/lib/' \
-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>