Changeset 2d66549 for chapter08


Ignore:
Timestamp:
03/31/2021 10:41:40 AM (3 years ago)
Author:
Xℹ Ruoyao <xry111@…>
Branches:
ml-11.0, multilib
Children:
e28ad21
Parents:
a2ef756
git-author:
Thomas Trepl <thomas@…> (09/25/2020 08:04:54 AM)
git-committer:
Xℹ Ruoyao <xry111@…> (03/31/2021 10:41:40 AM)
Message:

Merge changes from trunk to multilib

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

Location:
chapter08
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • chapter08/attr.xml

    ra2ef756 r2d66549  
    9090<screen><userinput remap="pre">make distclean</userinput></screen>
    9191
    92     <para>Prepare Xz for compilation:</para>
     92    <para>Prepare Attr for compilation:</para>
    9393
    9494<screen><userinput remap="configure">CC="gcc -m32" ./configure \
    … …  
    121121<screen><userinput remap="pre">make distclean</userinput></screen>
    122122
    123     <para>Prepare Xz for compilation:</para>
     123    <para>Prepare Attr for compilation:</para>
    124124
    125125<screen><userinput remap="configure">CC="gcc -mx32" ./configure \

  • chapter08/gmp.xml

    ra2ef756 r2d66549  
    135135    the following:</para>
    136136
    137 <screen><userinput remap="pre">cp -v configfsf.guess config.guess
     137<screen role="nodump"><userinput remap="pre">cp -v configfsf.guess config.guess
    138138cp -v configfsf.sub   config.sub</userinput></screen>
    139139
    … …  
    207207    the following:</para>
    208208
    209 <screen><userinput remap="pre">cp -v configfsf.guess config.guess
     209<screen role="nodump"><userinput remap="pre">cp -v configfsf.guess config.guess
    210210cp -v configfsf.sub   config.sub</userinput></screen>
    211211

  • chapter08/libelf.xml

    ra2ef756 r2d66549  
    4747    <para>Prepare Libelf for compilation:</para>
    4848
    49 <screen><userinput remap="configure">./configure --prefix=/usr --disable-debuginfod --libdir=/lib</userinput></screen>
     49    <screen><userinput remap="configure">./configure --prefix=/usr                \
     50            --disable-debuginfod         \
     51            --enable-libdebuginfod=dummy \
     52            --libdir=/lib</userinput></screen>
    5053
    5154    <para>Compile the package:</para>

  • chapter08/tcl.xml

    ra2ef756 r2d66549  
    139139
    140140<screen><userinput remap="install">ln -sfv tclsh&tcl-major-version; /usr/bin/tclsh</userinput></screen>
     141
     142    <para>Finally, rename a man page that conflicts with a Perl man page:</para>
     143
     144    <screen><userinput remap="install">mv /usr/share/man/man3/{Thread,Tcl_Thread}.3</userinput></screen>
    141145
    142146  </sect2>

  • chapter08/zstd.xml

    ra2ef756 r2d66549  
    8383<screen><userinput remap="install">CC="gcc -m32" make prefix=/usr DESTDIR=$PWD/DESTDIR install
    8484cp -Rv DESTDIR/usr/lib/* &usr-lib-m32;/
    85 sed -e "/^libdir/s/lib$&lib-m32;/" -i &usr-lib-m32;/pkgconfig/libzstd.pc</userinput></screen>
     85sed -e "/^libdir/s/lib$&lib-m32;/" -i &usr-lib-m32;/pkgconfig/libzstd.pc
     86rm -rf DESTDIR</userinput></screen>
    8687
    8788  </sect2><!-- m32 -->
    … …  
    106107<screen><userinput remap="install">CC="gcc -mx32" make prefix=/usr DESTDIR=$PWD/DESTDIR install
    107108cp -Rv DESTDIR/usr/lib/* &usr-lib-mx32;/
    108 sed -e "/^libdir/s/lib$&lib-mx32;/" -i &usr-lib-mx32;/pkgconfig/libzstd.pc</userinput></screen>
     109sed -e "/^libdir/s/lib$&lib-mx32;/" -i &usr-lib-mx32;/pkgconfig/libzstd.pc
     110rm -rf DESTDIR</userinput></screen>
    109111
    110112  </sect2><!-- mx32 -->
Note: See TracChangeset for help on using the changeset viewer.