Changeset 9da9d014 for chapter06


Ignore:
Timestamp:
03/31/2021 10:41:41 AM (3 years ago)
Author:
Xℹ Ruoyao <xry111@…>
Branches:
ml-11.0, multilib
Children:
a5c2803
Parents:
edd83dc
git-author:
Thomas Trepl <thomas@…> (02/03/2021 08:02:01 AM)
git-committer:
Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:41 AM)
Message:

Merge changes from trunk to multilib

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

Location:
chapter06
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • chapter06/binutils-pass2.xml

    redd83dc r9da9d014  
    102102<screen><userinput remap="make">make</userinput></screen>
    103103
    104     <para>Install the package:</para>
     104    <para>Install the package, and
     105    workaround an issue causing
     106    <filename class="libraryfile">libctf.so</filename>
     107    to link against zlib from the host distribution:</para>
    105108
    106 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
     109<screen><userinput remap="install">make DESTDIR=$LFS install
     110install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
     111
     112    <para>
     113      Workaround an issue causing
     114      <filename class="libraryfile">libctf.so</filename>
     115      to link against zlib from the host distribution:
     116    </para>
     117
     118<screen><userinput remap="install">install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
    107119
    108120  </sect2>

  • chapter06/chapter06.xml

    redd83dc r9da9d014  
    2323  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grep.xml"/>
    2424  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
    25   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
     25  <!--xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/-->
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>

  • chapter06/file.xml

    redd83dc r9da9d014  
    4444    <title>Installation of File</title>
    4545
     46    <para>
     47       The <command>file</command> command on the build host needs
     48       to be same version as the one we are building in order to
     49       create the signature file. Run the following commands to build it:
     50    </para>
     51
     52<screen><userinput remap="pre">mkdir build
     53pushd build
     54  ../configure
     55  make
     56popd</userinput></screen>
     57
    4658    <para>Prepare File for compilation:</para>
    4759
    48 <screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT</userinput></screen>
     60<screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT --build=$(./config.guess)</userinput></screen>
    4961
    5062<!-- devs: if using - -build here, the build system wants to compile
    … …  
    5567    <para>Compile the package:</para>
    5668
    57 <screen><userinput remap="make">make</userinput></screen>
     69<screen><userinput remap="make">make FILE_COMPILE=$(pwd)/build/src/file</userinput></screen>
    5870
    5971    <para>Install the package:</para>

  • chapter06/ncurses.xml

    redd83dc r9da9d014  
    178178./configure --prefix=/usr           \
    179179            --host=$LFS_TGT32       \
     180            --build=$(./config.guess)    \
    180181            --libdir=&usr-lib-m32;     \
    181182            --mandir=/usr/share/man \
    … …  
    217218./configure --prefix=/usr           \
    218219            --host=$LFS_TGTX32      \
     220            --build=$(./config.guess)    \
    219221            --libdir=&usr-lib-mx32;    \
    220222            --mandir=/usr/share/man \
Note: See TracChangeset for help on using the changeset viewer.