Changeset 2b4b9f4 in clfs-sysroot for BOOK/final-system


Ignore:
Timestamp:
Mar 15, 2009, 1:16:09 PM (16 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
master
Children:
b3e939f
Parents:
e84c831
Message:

Updated Readline to 6.0.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/readline.xml

    re84c831 r2b4b9f4  
    2626    <title>Installation of Readline</title>
    2727
    28     <para os="p1">The following patch contains updates from the maintainer. The
    29     maintainer of Readline only releases these patches to fix serious issues:
    30     </para>
     28    <para os="s1">This option forces Readline to link against the
     29          <filename class="libraryfile">libncursesw</filename> library:</para>
    3130
    32 <screen os="p2"><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
     31<screen os="s2"><userinput>sed -i 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncursesw:' support/shobj-conf</userinput></screen>
    3332
    3433    <para os="a">Prepare Readline for compilation:</para>
    … …  
    3938    <para os="c">Compile the package:</para>
    4039
    41 <screen os="d"><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
     40<screen os="d"><userinput>make</userinput></screen>
    4241
    43     <variablelist os="e">
    44       <title>The meaning of the make option:</title>
     42    <para os="e">Install the package:</para>
    4543
    46       <varlistentry>
    47         <term><parameter>SHLIB_XLDFLAGS=-lncurses</parameter></term>
    48         <listitem>
    49           <para>This option forces Readline to link against the
    50           <filename class="libraryfile">libncurses</filename> library.</para>
    51         </listitem>
    52       </varlistentry>
    53     </variablelist>
     44<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
    5445
    55     <para os="f">Install the package:</para>
     46    <para os="h">Install the documentation:</para>
    5647
    57 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     48<screen os="i"><userinput>make install-doc</userinput></screen>
    5849
    59     <para os="h">Now move the static libraries to a more appropriate location:</para>
     50    <para os="j">Now move the static libraries to a more appropriate location:</para>
    6051
    61 <screen os="i"><userinput>mv -v ${CLFS}/lib/lib{readline,history}.a ${CLFS}/usr/lib</userinput></screen>
     52<screen os="k"><userinput>mv -v ${CLFS}/lib/lib{readline,history}.a ${CLFS}/usr/lib</userinput></screen>
    6253
    63     <para os="j">Next, remove the <filename class="extension">.so</filename>
     54    <para os="l">Next, remove the <filename class="extension">.so</filename>
    6455    files in <filename class="directory">/lib</filename> and relink them into
    6556    <filename class="directory">/usr/lib</filename>.</para>
    6657
    67 <screen os="k"><userinput>rm -v ${CLFS}/lib/lib{readline,history}.so
    68 ln -sfv ../../lib/libreadline.so.5 ${CLFS}/usr/lib/libreadline.so
    69 ln -sfv ../../lib/libhistory.so.5 ${CLFS}/usr/lib/libhistory.so</userinput></screen>
     58<screen os="m"><userinput>rm -v ${CLFS}/lib/lib{readline,history}.so
     59ln -sfv ../../lib/libreadline.so.&readline-version2; ${CLFS}/usr/lib/libreadline.so
     60ln -sfv ../../lib/libhistory.so.&readline-version2; ${CLFS}/usr/lib/libhistory.so</userinput></screen>
    7061
    7162  </sect2>
Note: See TracChangeset for help on using the changeset viewer.