[Clfs-commits] commit: r4832 - in /branches/clfs-sysroot: BOOK/final-system/common/readline.xml BOOK/introduction/common/changelog.xml BOOK/materials/common/patches.xml BOOK/packages.ent BOOK/patches.ent patches/readline-5.2-fixes-5.patch

svn at cross-lfs.org svn at cross-lfs.org
Sun Mar 15 13:16:10 PDT 2009 

Author: jciccone
Date: Sun Mar 15 20:16:09 2009
New Revision: 4832

Log:
Updated Readline to 6.0.

Removed:
    branches/clfs-sysroot/patches/readline-5.2-fixes-5.patch
Modified:
    branches/clfs-sysroot/BOOK/final-system/common/readline.xml
    branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
    branches/clfs-sysroot/BOOK/materials/common/patches.xml
    branches/clfs-sysroot/BOOK/packages.ent
    branches/clfs-sysroot/BOOK/patches.ent

Modified: branches/clfs-sysroot/BOOK/final-system/common/readline.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/readline.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/readline.xml Sun Mar 15 20:16:09 2009
@@ -25,11 +25,10 @@
   <sect2 role="installation">
     <title>Installation of Readline</title>
 
-    <para os="p1">The following patch contains updates from the maintainer. The
-    maintainer of Readline only releases these patches to fix serious issues:
-    </para>
+    <para os="s1">This option forces Readline to link against the
+          <filename class="libraryfile">libncursesw</filename> library:</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
+<screen os="s2"><userinput>sed -i 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncursesw:' support/shobj-conf</userinput></screen>
 
     <para os="a">Prepare Readline for compilation:</para>
 
@@ -38,35 +37,27 @@
 
     <para os="c">Compile the package:</para>
 
-<screen os="d"><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
+<screen os="d"><userinput>make</userinput></screen>
 
-    <variablelist os="e">
-      <title>The meaning of the make option:</title>
+    <para os="e">Install the package:</para>
 
-      <varlistentry>
-        <term><parameter>SHLIB_XLDFLAGS=-lncurses</parameter></term>
-        <listitem>
-          <para>This option forces Readline to link against the
-          <filename class="libraryfile">libncurses</filename> library.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
 
-    <para os="f">Install the package:</para>
+    <para os="h">Install the documentation:</para>
 
-<screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="i"><userinput>make install-doc</userinput></screen>
 
-    <para os="h">Now move the static libraries to a more appropriate location:</para>
+    <para os="j">Now move the static libraries to a more appropriate location:</para>
 
-<screen os="i"><userinput>mv -v ${CLFS}/lib/lib{readline,history}.a ${CLFS}/usr/lib</userinput></screen>
+<screen os="k"><userinput>mv -v ${CLFS}/lib/lib{readline,history}.a ${CLFS}/usr/lib</userinput></screen>
 
-    <para os="j">Next, remove the <filename class="extension">.so</filename>
+    <para os="l">Next, remove the <filename class="extension">.so</filename>
     files in <filename class="directory">/lib</filename> and relink them into
     <filename class="directory">/usr/lib</filename>.</para>
 
-<screen os="k"><userinput>rm -v ${CLFS}/lib/lib{readline,history}.so
-ln -sfv ../../lib/libreadline.so.5 ${CLFS}/usr/lib/libreadline.so
-ln -sfv ../../lib/libhistory.so.5 ${CLFS}/usr/lib/libhistory.so</userinput></screen>
+<screen os="m"><userinput>rm -v ${CLFS}/lib/lib{readline,history}.so
+ln -sfv ../../lib/libreadline.so.&readline-version2; ${CLFS}/usr/lib/libreadline.so
+ln -sfv ../../lib/libhistory.so.&readline-version2; ${CLFS}/usr/lib/libhistory.so</userinput></screen>
 
   </sect2>
 

Modified: branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/introduction/common/changelog.xml (original)
+++ branches/clfs-sysroot/BOOK/introduction/common/changelog.xml Sun Mar 15 20:16:09 2009
@@ -39,6 +39,9 @@
     <listitem>
       <para>March 15, 2009</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated Readline to 6.0.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Added i18n Patch to Diffutils.</para>
         </listitem>

Modified: branches/clfs-sysroot/BOOK/materials/common/patches.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/materials/common/patches.xml (original)
+++ branches/clfs-sysroot/BOOK/materials/common/patches.xml Sun Mar 15 20:16:09 2009
@@ -190,15 +190,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Readline Fixes - <token>&readline-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&readline-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Shadow Sysroot Hacks Patch - <token>&shadow-sysroot_hacks-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink

Modified: branches/clfs-sysroot/BOOK/packages.ent
==============================================================================
--- branches/clfs-sysroot/BOOK/packages.ent (original)
+++ branches/clfs-sysroot/BOOK/packages.ent Sun Mar 15 20:16:09 2009
@@ -253,10 +253,11 @@
 <!ENTITY psmisc-md5 "2e81938855cf5cc38856bd4a31d79a4c">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net">
 
-<!ENTITY readline-version "5.2">
-<!ENTITY readline-size "1,996 KB">
+<!ENTITY readline-version2 "6">
+<!ENTITY readline-version "&readline-version2;.0">
+<!ENTITY readline-size "2,217 KB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "e39331f32ad14009b9ff49cc10c5e751">
+<!ENTITY readline-md5 "b7f65a48add447693be6e86f04a63019">
 <!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
 
 <!ENTITY sed-version "4.1.5">

Modified: branches/clfs-sysroot/BOOK/patches.ent
==============================================================================
--- branches/clfs-sysroot/BOOK/patches.ent (original)
+++ branches/clfs-sysroot/BOOK/patches.ent Sun Mar 15 20:16:09 2009
@@ -80,10 +80,6 @@
 <!ENTITY perl-cross_compile-patch-md5 "7bbb78618e2dd95987ad04c6c54a81c6">
 <!ENTITY perl-cross_compile-patch-size "140 KB">
 
-<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-5.patch">
-<!ENTITY readline-fixes-patch-md5 "353320fac0a48339f4eccec72591ae3b">
-<!ENTITY readline-fixes-patch-size "24 KB">
-
 <!ENTITY shadow-sysroot_hacks-patch "shadow-&shadow-version;-sysroot_hacks-2.patch">
 <!ENTITY shadow-sysroot_hacks-patch-md5 "cf5095a86c666728650e77f1cdc64874">
 <!ENTITY shadow-sysroot_hacks-patch-size "36 KB">

More information about the Clfs-commits mailing list