[Clfs-commits] commit: r4371 - in /trunk/BOOK: final-system/common/readline.xml final-system/multilib/readline-64bit.xml final-system/multilib/readline-n32.xml final-system/multilib/readline.xml introduction/common/changelog.xml
svn at cross-lfs.org
svn at cross-lfs.org
Wed Jan 7 10:55:13 PST 2009
Author: jim
Date: Wed Jan 7 18:55:12 2009
New Revision: 4371
Log:
Cleanup Readline Build. Changed the way to link ncurses
Modified:
trunk/BOOK/final-system/common/readline.xml
trunk/BOOK/final-system/multilib/readline-64bit.xml
trunk/BOOK/final-system/multilib/readline-n32.xml
trunk/BOOK/final-system/multilib/readline.xml
trunk/BOOK/introduction/common/changelog.xml
Modified: trunk/BOOK/final-system/common/readline.xml
==============================================================================
--- trunk/BOOK/final-system/common/readline.xml (original)
+++ trunk/BOOK/final-system/common/readline.xml Wed Jan 7 18:55:12 2009
@@ -30,41 +30,34 @@
<screen os="p2"><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
+ <para os="s1">This option forces Readline to link against the
+ <filename class="libraryfile">libncurses</filename> library:</para>
+
+<screen os="s2"><userinput>sed -i 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf</userinput></screen>
+
<para os="a">Prepare Readline for compilation:</para>
<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
<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">This package does not come with a test suite.</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>
+ <para os="f">Install the package:</para>
- <para os="f">This package does not come with a test suite.</para>
+<screen os="g"><userinput>make install</userinput></screen>
- <para os="g">Install the package:</para>
+ <para os="h">Now move the static libraries to a more appropriate location:</para>
-<screen os="h"><userinput>make install</userinput></screen>
+<screen os="i"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
- <para os="k">Now move the static libraries to a more appropriate location:</para>
-
-<screen os="l"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
-
- <para os="m">Next, remove the <filename class="extension">.so</filename>
+ <para os="j">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="n"><userinput>rm -v /lib/lib{readline,history}.so
+<screen os="k"><userinput>rm -v /lib/lib{readline,history}.so
ln -svf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
ln -svf ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen>
Modified: trunk/BOOK/final-system/multilib/readline-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/readline-64bit.xml (original)
+++ trunk/BOOK/final-system/multilib/readline-64bit.xml Wed Jan 7 18:55:12 2009
@@ -31,6 +31,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="readline.xml"
+ xpointer="xpointer(//*[@os='s1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="readline.xml"
+ xpointer="xpointer(//*[@os='s2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="readline.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
@@ -60,17 +68,13 @@
href="readline.xml"
xpointer="xpointer(//*[@os='h'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="readline.xml"
- xpointer="xpointer(//*[@os='k'])"/>
+<screen os="i"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
-<screen os="l"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
-
- <para os="m">Next, remove the <filename class="extension">.so</filename>
+ <para os="j">Next, remove the <filename class="extension">.so</filename>
files in <filename class="directory">/lib64</filename> and relink them into
<filename class="directory">/usr/lib64</filename>.</para>
-<screen os="n"><userinput>rm -v /lib64/lib{readline,history}.so
+<screen os="k"><userinput>rm -v /lib64/lib{readline,history}.so
ln -svf ../../lib64/libreadline.so.5 /usr/lib64/libreadline.so
ln -svf ../../lib64/libhistory.so.5 /usr/lib64/libhistory.so</userinput></screen>
Modified: trunk/BOOK/final-system/multilib/readline-n32.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/readline-n32.xml (original)
+++ trunk/BOOK/final-system/multilib/readline-n32.xml Wed Jan 7 18:55:12 2009
@@ -32,6 +32,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="readline.xml"
+ xpointer="xpointer(//*[@os='s1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="readline.xml"
+ xpointer="xpointer(//*[@os='s2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="readline.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
@@ -61,17 +69,13 @@
href="readline.xml"
xpointer="xpointer(//*[@os='h'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="readline.xml"
- xpointer="xpointer(//*[@os='k'])"/>
+<screen os="i"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
-<screen os="l"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
-
- <para os="m">Next, remove the <filename class="extension">.so</filename>
+ <para os="j">Next, remove the <filename class="extension">.so</filename>
files in <filename class="directory">/lib32</filename> and relink them into
<filename class="directory">/usr/lib32</filename>.</para>
-<screen os="n"><userinput>rm -v /lib32/lib{readline,history}.so
+<screen os="k"><userinput>rm -v /lib32/lib{readline,history}.so
ln -svf ../../lib32/libreadline.so.5 /usr/lib32/libreadline.so
ln -svf ../../lib32/libhistory.so.5 /usr/lib32/libhistory.so</userinput></screen>
Modified: trunk/BOOK/final-system/multilib/readline.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/readline.xml (original)
+++ trunk/BOOK/final-system/multilib/readline.xml Wed Jan 7 18:55:12 2009
@@ -32,6 +32,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/readline.xml"
+ xpointer="xpointer(//*[@os='s1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/readline.xml"
+ xpointer="xpointer(//*[@os='s2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/readline.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
@@ -63,19 +71,16 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/readline.xml"
- xpointer="xpointer(//*[@os='k'])"/>
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/readline.xml"
- xpointer="xpointer(//*[@os='l'])"/>
+ xpointer="xpointer(//*[@os='j'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/readline.xml"
- xpointer="xpointer(//*[@os='m'])"/>
+ xpointer="xpointer(//*[@os='k'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../common/readline.xml"
- xpointer="xpointer(//*[@os='n'])"/>
</sect2>
<sect2 role="content">
Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Wed Jan 7 18:55:12 2009
@@ -55,6 +55,9 @@
<listitem>
<para>[Jim] - Added arch to util-linux-ng build. Also fixed descriptions of
configure paramters.</para>
+ </listitem>
+ <listitem>
+ <para>[Jim] - Cleanup Readline Build. Changed the way to link ncurses.</para>
</listitem>
</itemizedlist>
</listitem>
More information about the Clfs-commits
mailing list