[Clfs-commits] commit: r4443 - in /trunk/BOOK/final-system: ./ common/ multilib/
svn at cross-lfs.org
svn at cross-lfs.org
Sun Jan 11 02:08:38 PST 2009
Author: jim
Date: Sun Jan 11 10:08:38 2009
New Revision: 4443
Log:
Only build one version of Ncurses.
Removed:
trunk/BOOK/final-system/common/ncurses-widec.xml
trunk/BOOK/final-system/multilib/ncurses-widec-64bit.xml
trunk/BOOK/final-system/multilib/ncurses-widec-n32.xml
trunk/BOOK/final-system/multilib/ncurses-widec.xml
Modified:
trunk/BOOK/final-system/alpha-chapter.xml
trunk/BOOK/final-system/common/ncurses.xml
trunk/BOOK/final-system/common/readline.xml
trunk/BOOK/final-system/mips-chapter.xml
trunk/BOOK/final-system/mips64-64-chapter.xml
trunk/BOOK/final-system/mips64-chapter.xml
trunk/BOOK/final-system/multilib/ncurses-64bit.xml
trunk/BOOK/final-system/multilib/ncurses-n32.xml
trunk/BOOK/final-system/multilib/ncurses.xml
trunk/BOOK/final-system/native-chapter.xml
trunk/BOOK/final-system/native64-chapter.xml
trunk/BOOK/final-system/ppc-chapter.xml
trunk/BOOK/final-system/ppc64-chapter.xml
trunk/BOOK/final-system/sparc-chapter.xml
trunk/BOOK/final-system/sparc64-64-chapter.xml
trunk/BOOK/final-system/sparc64-chapter.xml
trunk/BOOK/final-system/x86-chapter.xml
trunk/BOOK/final-system/x86_64-64-chapter.xml
trunk/BOOK/final-system/x86_64-chapter.xml
Modified: trunk/BOOK/final-system/alpha-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/alpha-chapter.xml (original)
+++ trunk/BOOK/final-system/alpha-chapter.xml Sun Jan 11 10:08:38 2009
@@ -31,7 +31,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
Modified: trunk/BOOK/final-system/common/ncurses.xml
==============================================================================
--- trunk/BOOK/final-system/common/ncurses.xml (original)
+++ trunk/BOOK/final-system/common/ncurses.xml Sun Jan 11 10:08:38 2009
@@ -33,8 +33,7 @@
<para os="a">Prepare Ncurses for compilation:</para>
<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib \
- --with-shared --without-debug \
- --includedir=/usr/include/ncurses</userinput></screen>
+ --with-shared --without-debug --enable-widec</userinput></screen>
<para os="c">Compile the package:</para>
@@ -48,16 +47,21 @@
<para os="h">Move the Ncurses static libraries to the proper location:</para>
-<screen os="i"><userinput>mv -v /lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib</userinput></screen>
+<screen os="i"><userinput>mv -v /lib/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a /usr/lib</userinput></screen>
<para os="j">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
-<screen os="k"><userinput>rm -v /lib/lib{ncurses,menu,panel,form,curses}.so
-ln -svf ../../lib/libncurses.so.5 /usr/lib/libcurses.so
-ln -svf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
-ln -svf ../../lib/libmenu.so.5 /usr/lib/libmenu.so
-ln -svf ../../lib/libpanel.so.5 /usr/lib/libpanel.so
-ln -svf ../../lib/libform.so.5 /usr/lib/libform.so</userinput></screen>
+<screen os="k"><userinput>rm -v /lib/lib{ncursesw,menuw,panelw,formw,cursesw}.so
+ln -svf ../../lib/libncursesw.so.5 /usr/lib/libcursesw.so
+ln -svf ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
+ln -svf ../../lib/libmenuw.so.5 /usr/lib/libmenuw.so
+ln -svf ../../lib/libpanelw.so.5 /usr/lib/libpanelw.so
+ln -svf ../../lib/libformw.so.5 /usr/lib/libformw.so</userinput></screen>
+
+ <para os="l">Now we will create a symlink for /usr/share/terminfo in
+ <filename class="directory">/usr/lib</filename> for compatibility:</para>
+
+<screen os="m"><userinput>ln -sf ../../usr/share/terminfo /usr/lib/terminfo</userinput></screen>
</sect2>
@@ -69,10 +73,11 @@
<segtitle>Installed libraries</segtitle>
<seglistitem>
- <seg>ncurses5-config</seg>
- <seg>libcurses.[a,so] (link to libncurses.[a,so]), libform.[a,so],
- libmenu.[a,so], libncurses++.a, libncurses.[a,so], and
- libpanel.[a,so]</seg>
+ <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
+ ncursesw5-config, reset (link to tset), tack, tic, toe, tput, and tset</seg>
+ <seg>libcursesw.so (link to libncurses.so), libformw.[a,so],
+ libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so], and
+ libpanelw.[a,so]</seg>
</seglistitem>
</segmentedlist>
@@ -81,65 +86,172 @@
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="ncurses5-config">
- <term><command>ncurses5-config</command></term>
+ <varlistentry id="captoinfo">
+ <term><command>captoinfo</command></term>
+ <listitem>
+ <para>Converts a termcap description into a terminfo description</para>
+ <indexterm zone="ch-system-ncurses captoinfo">
+ <primary sortas="b-captoinfo">captoinfo</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="clear">
+ <term><command>clear</command></term>
+ <listitem>
+ <para>Clears the screen, if possible</para>
+ <indexterm zone="ch-system-ncurses clear">
+ <primary sortas="b-clear">clear</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="infocmp">
+ <term><command>infocmp</command></term>
+ <listitem>
+ <para>Compares or prints out terminfo descriptions</para>
+ <indexterm zone="ch-system-ncurses infocmp">
+ <primary sortas="b-infocmp">infocmp</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="infotocap">
+ <term><command>infotocap</command></term>
+ <listitem>
+ <para>Converts a terminfo description into a termcap description</para>
+ <indexterm zone="ch-system-ncurses infotocap">
+ <primary sortas="b-infotocap">infotocap</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="ncursesw5-config">
+ <term><command>ncursesw5-config</command></term>
<listitem>
<para>Provides configuration information for ncurses</para>
- <indexterm zone="ch-system-ncurses ncurses5-config">
- <primary sortas="b-ncurses5-config">ncurses5-config</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libcurses">
- <term><filename class="libraryfile">libcurses</filename></term>
- <listitem>
- <para>A link to <filename>libncurses</filename></para>
- <indexterm zone="ch-system-ncurses libcurses">
- <primary sortas="c-libcurses">libcurses</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libncurses">
- <term><filename class="libraryfile">libncurses</filename></term>
+ <indexterm zone="ch-system-ncurses ncursesw5-config">
+ <primary sortas="b-ncursesw5-config">ncursesw5-config</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="reset">
+ <term><command>reset</command></term>
+ <listitem>
+ <para>Reinitializes a terminal to its default values</para>
+ <indexterm zone="ch-system-ncurses reset">
+ <primary sortas="b-reset">reset</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="tack">
+ <term><command>tack</command></term>
+ <listitem>
+ <para>The terminfo action checker; it is mainly used to test the
+ accuracy of an entry in the terminfo database</para>
+ <indexterm zone="ch-system-ncurses tack">
+ <primary sortas="b-tack">tack</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="tic">
+ <term><command>tic</command></term>
+ <listitem>
+ <para>The terminfo entry-description compiler that translates a
+ terminfo file from source format into the binary format needed for the
+ ncurses library routines. A terminfo file contains information on the
+ capabilities of a certain terminal</para>
+ <indexterm zone="ch-system-ncurses tic">
+ <primary sortas="b-tic">tic</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="toe">
+ <term><command>toe</command></term>
+ <listitem>
+ <para>Lists all available terminal types, giving the primary name and
+ description for each</para>
+ <indexterm zone="ch-system-ncurses toe">
+ <primary sortas="b-toe">toe</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="tput">
+ <term><command>tput</command></term>
+ <listitem>
+ <para>Makes the values of terminal-dependent capabilities available to
+ the shell; it can also be used to reset or initialize a terminal or
+ report its long name</para>
+ <indexterm zone="ch-system-ncurses tput">
+ <primary sortas="b-tput">tput</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="tset">
+ <term><command>tset</command></term>
+ <listitem>
+ <para>Can be used to initialize terminals</para>
+ <indexterm zone="ch-system-ncurses tset">
+ <primary sortas="b-tset">tset</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="libcursesw">
+ <term><filename class="libraryfile">libcursesw</filename></term>
+ <listitem>
+ <para>A link to <filename>libncursesw</filename></para>
+ <indexterm zone="ch-system-ncurses libcursesw">
+ <primary sortas="c-libcursesw">libcursesw</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="libncursesw">
+ <term><filename class="libraryfile">libncursesw</filename></term>
<listitem>
<para>Contains functions to display text in many complex ways on a
terminal screen; a good example of the use of these functions is the
menu displayed during the kernel's
<command>make menuconfig</command></para>
- <indexterm zone="ch-system-ncurses libncurses">
- <primary sortas="c-libncurses">libncurses</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libform">
- <term><filename class="libraryfile">libform</filename></term>
+ <indexterm zone="ch-system-ncurses libncursesw">
+ <primary sortas="c-libncursesw">libncursesw</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="libformw">
+ <term><filename class="libraryfile">libformw</filename></term>
<listitem>
<para>Contains functions to implement forms</para>
- <indexterm zone="ch-system-ncurses libform">
- <primary sortas="c-libform">libform</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libmenu">
- <term><filename class="libraryfile">libmenu</filename></term>
+ <indexterm zone="ch-system-ncurses libformw">
+ <primary sortas="c-libform">libformw</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="libmenuw">
+ <term><filename class="libraryfile">libmenuw</filename></term>
<listitem>
<para>Contains functions to implement menus</para>
- <indexterm zone="ch-system-ncurses libmenu">
- <primary sortas="c-libmenu">libmenu</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libpanel">
- <term><filename class="libraryfile">libpanel</filename></term>
+ <indexterm zone="ch-system-ncurses libmenuw">
+ <primary sortas="c-libmenuw">libmenuw</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry id="libpanelw">
+ <term><filename class="libraryfile">libpanelw</filename></term>
<listitem>
<para>Contains functions to implement panels</para>
- <indexterm zone="ch-system-ncurses libpanel">
- <primary sortas="c-libpanel">libpanel</primary>
+ <indexterm zone="ch-system-ncurses libpanelw">
+ <primary sortas="c-libpanelw">libpanelw</primary>
</indexterm>
</listitem>
</varlistentry>
Modified: trunk/BOOK/final-system/common/readline.xml
==============================================================================
--- trunk/BOOK/final-system/common/readline.xml (original)
+++ trunk/BOOK/final-system/common/readline.xml Sun Jan 11 10:08:38 2009
@@ -31,9 +31,9 @@
<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>
+ <filename class="libraryfile">libncursesw</filename> library:</para>
-<screen os="s2"><userinput>sed -i 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf</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>
Modified: trunk/BOOK/final-system/mips-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/mips-chapter.xml (original)
+++ trunk/BOOK/final-system/mips-chapter.xml Sun Jan 11 10:08:38 2009
@@ -31,7 +31,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
Modified: trunk/BOOK/final-system/mips64-64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/mips64-64-chapter.xml (original)
+++ trunk/BOOK/final-system/mips64-64-chapter.xml Sun Jan 11 10:08:38 2009
@@ -31,7 +31,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
Modified: trunk/BOOK/final-system/mips64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/mips64-chapter.xml (original)
+++ trunk/BOOK/final-system/mips64-chapter.xml Sun Jan 11 10:08:38 2009
@@ -45,9 +45,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-widec.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-widec-n32.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-widec-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
Modified: trunk/BOOK/final-system/multilib/ncurses-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/ncurses-64bit.xml (original)
+++ trunk/BOOK/final-system/multilib/ncurses-64bit.xml Sun Jan 11 10:08:38 2009
@@ -35,8 +35,8 @@
<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
./configure --prefix=/usr --libdir=/lib64 \
- --with-shared --without-debug \
- --includedir=/usr/include/ncurses</userinput></screen>
+ --with-shared --without-debug --enable-widec \
+ --includedir=/usr/include/ncursesw</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="ncurses.xml"
@@ -58,26 +58,31 @@
href="ncurses.xml"
xpointer="xpointer(//*[@os='g'])"/>
- <para os="m1">Prepare <filename>ncurses5-config</filename> to be wrapped by
+ <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
the multiarch wrapper and then wrap it:</para>
-<screen os="m2"><userinput>mv -v /usr/bin/ncurses5-config{,-64}
-ln -sv multiarch_wrapper /usr/bin/ncurses5-config</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-64}
+ln -sv multiarch_wrapper /usr/bin/ncursesw5-config</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="ncurses.xml"
xpointer="xpointer(//*[@os='h'])"/>
-<screen os="i"><userinput>mv -v /lib64/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib64</userinput></screen>
+<screen os="i"><userinput>mv -v /lib64/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a /usr/lib64</userinput></screen>
<para os="j">Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
-<screen os="k"><userinput>rm -v /lib64/lib{ncurses,menu,panel,form,curses}.so
-ln -svf ../../lib64/libncurses.so.5 /usr/lib64/libncurses.so
-ln -svf ../../lib64/libncurses.so.5 /usr/lib64/libcurses.so
-ln -svf ../../lib64/libmenu.so.5 /usr/lib64/libmenu.so
-ln -svf ../../lib64/libpanel.so.5 /usr/lib64/libpanel.so
-ln -svf ../../lib64/libform.so.5 /usr/lib64/libform.so</userinput></screen>
+<screen os="k"><userinput>rm -v /lib64/lib{ncursesw,menuw,panelw,formw,cursesw}.so
+ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libcursesw.so
+ln -svf ../../lib64/libncursesw.so.5 /usr/lib64/libncursesw.so
+ln -svf ../../lib64/libmenuw.so.5 /usr/lib64/libmenuw.so
+ln -svf ../../lib64/libpanelw.so.5 /usr/lib64/libpanelw.so
+ln -svf ../../lib64/libformw.so.5 /usr/lib64/libformw.so</userinput></screen>
+
+ <para os="l">Now we will create a symlink for /usr/share/terminfo in
+ <filename class="directory">/usr/lib64</filename> for compatibility:</para>
+
+<screen os="m"><userinput>ln -sf ../../usr/share/terminfo /usr/lib64/terminfo</userinput></screen>
</sect2>
Modified: trunk/BOOK/final-system/multilib/ncurses-n32.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/ncurses-n32.xml (original)
+++ trunk/BOOK/final-system/multilib/ncurses-n32.xml Sun Jan 11 10:08:38 2009
@@ -36,8 +36,7 @@
<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
./configure --prefix=/usr --libdir=/lib32 \
- --with-shared --without-debug \
- --includedir=/usr/include/ncurses</userinput></screen>
+ --with-shared --without-debug --enable-widec</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="ncurses.xml"
@@ -59,25 +58,30 @@
href="ncurses.xml"
xpointer="xpointer(//*[@os='g'])"/>
- <para os="m1">Prepare <filename>ncurses5-config</filename> to be wrapped by
+ <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
the multiarch wrapper:</para>
-<screen os="m2"><userinput>mv -v /usr/bin/ncurses5-config{,-n32}</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-n32}</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="ncurses.xml"
xpointer="xpointer(//*[@os='h'])"/>
-<screen os="i"><userinput>mv -v /lib32/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib32</userinput></screen>
+<screen os="i"><userinput>mv -v /lib32/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a /usr/lib32</userinput></screen>
<para os="j">Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
-<screen os="k"><userinput>rm -v /lib32/lib{ncurses,menu,panel,form,curses}.so
-ln -svf ../../lib32/libncurses.so.5 /usr/lib32/libncurses.so
-ln -svf ../../lib32/libncurses.so.5 /usr/lib32/libcurses.so
-ln -svf ../../lib32/libmenu.so.5 /usr/lib32/libmenu.so
-ln -svf ../../lib32/libpanel.so.5 /usr/lib32/libpanel.so
-ln -svf ../../lib32/libform.so.5 /usr/lib32/libform.so</userinput></screen>
+<screen os="k"><userinput>rm -v /lib32/lib{ncursesw,menuw,panelw,formw,cursesw}.so
+ln -svf ../../lib32/libncursesw.so.5 /usr/lib32/libcursesw.so
+ln -svf ../../lib32/libncursesw.so.5 /usr/lib32/libncursesw.so
+ln -svf ../../lib32/libmenuw.so.5 /usr/lib32/libmenuw.so
+ln -svf ../../lib32/libpanelw.so.5 /usr/lib32/libpanelw.so
+ln -svf ../../lib32/libformw.so.5 /usr/lib32/libformw.so</userinput></screen>
+
+ <para os="l">Now we will create a symlink for /usr/share/terminfo in
+ <filename class="directory">/usr/lib32</filename> for compatibility:</para>
+
+<screen os="m"><userinput>ln -sf ../../usr/share/terminfo /usr/lib32/terminfo</userinput></screen>
</sect2>
Modified: trunk/BOOK/final-system/multilib/ncurses.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/ncurses.xml (original)
+++ trunk/BOOK/final-system/multilib/ncurses.xml Sun Jan 11 10:08:38 2009
@@ -36,8 +36,7 @@
<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
./configure --prefix=/usr --libdir=/lib \
- --with-shared --without-debug \
- --includedir=/usr/include/ncurses</userinput></screen>
+ --with-shared --without-debug --enable-widec</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/ncurses.xml"
@@ -59,10 +58,10 @@
href="../common/ncurses.xml"
xpointer="xpointer(//*[@os='g'])"/>
- <para os="m1">Prepare <filename>ncurses5-config</filename> to be wrapped by
+ <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
the multiarch wrapper:</para>
-<screen os="m2"><userinput>mv -v /usr/bin/ncurses5-config{,-32}</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-32}</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/ncurses.xml"
@@ -80,6 +79,14 @@
href="../common/ncurses.xml"
xpointer="xpointer(//*[@os='k'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/ncurses.xml"
+ xpointer="xpointer(//*[@os='l'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/ncurses.xml"
+ xpointer="xpointer(//*[@os='m'])"/>
+
</sect2>
<sect2 role="content">
Modified: trunk/BOOK/final-system/native-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/native-chapter.xml (original)
+++ trunk/BOOK/final-system/native-chapter.xml Sun Jan 11 10:08:38 2009
@@ -31,7 +31,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
Modified: trunk/BOOK/final-system/native64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/native64-chapter.xml (original)
+++ trunk/BOOK/final-system/native64-chapter.xml Sun Jan 11 10:08:38 2009
@@ -39,8 +39,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-widec.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-widec-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/libtool.xml"/>
Modified: trunk/BOOK/final-system/ppc-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/ppc-chapter.xml (original)
+++ trunk/BOOK/final-system/ppc-chapter.xml Sun Jan 11 10:08:38 2009
@@ -31,7 +31,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
Modified: trunk/BOOK/final-system/ppc64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/ppc64-chapter.xml (original)
+++ trunk/BOOK/final-system/ppc64-chapter.xml Sun Jan 11 10:08:38 2009
@@ -39,8 +39,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-widec.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-widec-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/libtool.xml"/>
Modified: trunk/BOOK/final-system/sparc-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/sparc-chapter.xml (original)
+++ trunk/BOOK/final-system/sparc-chapter.xml Sun Jan 11 10:08:38 2009
@@ -31,7 +31,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
Modified: trunk/BOOK/final-system/sparc64-64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/sparc64-64-chapter.xml (original)
+++ trunk/BOOK/final-system/sparc64-64-chapter.xml Sun Jan 11 10:08:38 2009
@@ -31,7 +31,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
Modified: trunk/BOOK/final-system/sparc64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/sparc64-chapter.xml (original)
+++ trunk/BOOK/final-system/sparc64-chapter.xml Sun Jan 11 10:08:38 2009
@@ -39,8 +39,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-widec.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-widec-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/libtool.xml"/>
Modified: trunk/BOOK/final-system/x86-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/x86-chapter.xml (original)
+++ trunk/BOOK/final-system/x86-chapter.xml Sun Jan 11 10:08:38 2009
@@ -31,7 +31,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
Modified: trunk/BOOK/final-system/x86_64-64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64-64-chapter.xml (original)
+++ trunk/BOOK/final-system/x86_64-64-chapter.xml Sun Jan 11 10:08:38 2009
@@ -31,7 +31,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses-widec.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
Modified: trunk/BOOK/final-system/x86_64-chapter.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64-chapter.xml (original)
+++ trunk/BOOK/final-system/x86_64-chapter.xml Sun Jan 11 10:08:38 2009
@@ -39,8 +39,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-widec.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-widec-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/libtool.xml"/>
More information about the Clfs-commits
mailing list