Changeset 9bfc37b for chapter06


Ignore:
Timestamp:
03/31/2021 10:41:35 AM (3 years ago)
Author:
Xℹ Ruoyao <xry111@…>
Branches:
ml-11.0, multilib
Children:
1803e9b
Parents:
e9d172b
git-author:
Thomas Trepl <thomas@…> (06/05/2019 03:37:03 PM)
git-committer:
Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:35 AM)
Message:

Merge changes from trunk

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

Location:
chapter06
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • chapter06/bison.xml

    re9d172b r9bfc37b  
    4141    <title>Installation of Bison</title>
    4242
     43    <para>First, fix a build problem with the current version:</para>
     44
     45<screen><userinput remap="pre">sed -i '6855 s/mv/cp/' Makefile.in</userinput></screen>
     46
    4347    <para>Prepare Bison for compilation:</para>
    4448
    4549<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/bison-&bison-version;</userinput></screen>
    4650
    47     <para>Compile the package:</para>
     51    <para>Compile the package, but work around a race condition in the
     52    current version:</para>
    4853
    49 <screen><userinput remap="make">make</userinput></screen>
     54<screen><userinput remap="make">make -j1</userinput></screen>
    5055
    5156<!--

  • chapter06/e2fsprogs.xml

    re9d172b r9bfc37b  
    6565             --disable-libuuid       \
    6666             --disable-uuidd         \
    67              --with-crond-dir=no     \
    6867             --disable-fsck</userinput></screen>
    6968
    … …  
    9998          <para>This creates the shared libraries which some programs
    10099          in this package use.</para>
    101         </listitem>
    102       </varlistentry>
    103 
    104       <varlistentry>
    105         <term><parameter>--with-crond-dir=no</parameter></term>
    106         <listitem>
    107           <para>This disables the installation of an unneded file.</para>
    108100        </listitem>
    109101      </varlistentry>

  • chapter06/expat.xml

    re9d172b r9bfc37b  
    103103 
    104104  <sect2 arch="ml_x32,ml_all" role="installation">
    105     <title>Installation of Zlib - x32-bit</title>
     105    <title>Installation of Expat - x32-bit</title>
    106106
    107107    <para>Clean previous build:</para>
    … …  
    112112    <para>Prepare Expat for compilation:</para>
    113113
    114 <screen><userinput remap="configure">
    115 CC="gcc -mx32" ./configure \
     114<screen><userinput remap="configure">CC="gcc -mx32" ./configure \
    116115    --prefix=/usr          \
    117116    --libdir=/usr/libx32   \

  • chapter06/perl.xml

    re9d172b r9bfc37b  
    6262<screen><userinput remap="pre">patch -Np1 -i ../&perl-gcc5-fixes-patch;</userinput></screen>
    6363-->
    64 
    65     <para>Apply a change to allow the program to build correctly when building
    66     with the latest versions of gcc:</para>
    67 
    68 <screen><userinput remap="pre">sed -i 's/67]/6789]/' Configure</userinput></screen>
    6964
    7065    <para>To have full control over the way Perl is set up, you can remove the
Note: See TracChangeset for help on using the changeset viewer.