[Clfs-commits] commit: r4617 - in /branches/clfs-sysroot: BOOK/ BOOK/cross-tools/common/ BOOK/final-system/ BOOK/final-system/common/ BOOK/introduction/common/ BOOK/materials/common/ patches/
svn at cross-lfs.org
svn at cross-lfs.org
Sat Jan 31 08:39:30 PST 2009
Author: jciccone
Date: Sat Jan 31 16:39:30 2009
New Revision: 4617
Log:
Port the ncurses widec build from trunk.
Added:
branches/clfs-sysroot/patches/ncurses-5.7-branch_update-6.patch
- copied unchanged from r4591, trunk/patches/ncurses-5.7-branch_update-6.patch
Removed:
branches/clfs-sysroot/BOOK/final-system/common/ncurses-widec.xml
Modified:
branches/clfs-sysroot/BOOK/cross-tools/common/ncurses.xml
branches/clfs-sysroot/BOOK/final-system/alpha-chapter.xml
branches/clfs-sysroot/BOOK/final-system/arm-chapter.xml
branches/clfs-sysroot/BOOK/final-system/common/ncurses.xml
branches/clfs-sysroot/BOOK/final-system/hppa-chapter.xml
branches/clfs-sysroot/BOOK/final-system/x86-chapter.xml
branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
branches/clfs-sysroot/BOOK/materials/common/patches.xml
branches/clfs-sysroot/BOOK/patches.ent
Modified: branches/clfs-sysroot/BOOK/cross-tools/common/ncurses.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/cross-tools/common/ncurses.xml (original)
+++ branches/clfs-sysroot/BOOK/cross-tools/common/ncurses.xml Sat Jan 31 16:39:30 2009
@@ -23,11 +23,11 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/common/ncurses.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
+ xpointer="xpointer(//*[@os='p3'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../../final-system/common/ncurses.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
+ xpointer="xpointer(//*[@os='p4'])"/>
<para os="a">Prepare Ncurses for compilation:</para>
Modified: branches/clfs-sysroot/BOOK/final-system/alpha-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/alpha-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/alpha-chapter.xml Sat Jan 31 16:39:30 2009
@@ -27,7 +27,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: branches/clfs-sysroot/BOOK/final-system/arm-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/arm-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/arm-chapter.xml Sat Jan 31 16:39:30 2009
@@ -27,7 +27,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: branches/clfs-sysroot/BOOK/final-system/common/ncurses.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/ncurses.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/ncurses.xml Sat Jan 31 16:39:30 2009
@@ -25,15 +25,21 @@
<sect2 role="installation">
<title>Installation of Ncurses</title>
- <para os="p1">This patch fixes an issue with some Bash versions:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&ncurses-bashfix-patch;</userinput></screen>
+ <para os="p1">The following patch contains updates from the &ncurses-version; branch
+ by the Ncurses developers:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&ncurses-branch_update-patch;</userinput></screen>
+
+ <para os="p3">This patch fixes an issue with some Bash versions:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&ncurses-bashfix-patch;</userinput></screen>
<para os="a">Prepare Ncurses for compilation:</para>
<screen os="b"><userinput>./configure --build=${CLFS_HOST} --host=${CLFS_TARGET} \
- --prefix=/usr --libdir=/lib --with-shared \
- --without-debug --without-ada --with-build-cc=gcc</userinput></screen>
+ --prefix=/usr --libdir=/lib --with-shared \
+ --enable-widec --without-debug --without-ada \
+ --with-build-cc=gcc</userinput></screen>
<para os="c">Compile the package:</para>
@@ -45,21 +51,33 @@
<para os="g">Move the Ncurses static libraries to the proper location:</para>
-<screen os="h"><userinput>mv -v ${CLFS}/lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a \
+<screen os="h"><userinput>mv -v ${CLFS}/lib/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a \
${CLFS}/usr/lib</userinput></screen>
<para os="i">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
-<screen os="j"><userinput>rm -v ${CLFS}/lib/lib{ncurses,menu,panel,form,curses}.so
-ln -sfv ../../lib/libncurses.so.&ncurses-version2; ${CLFS}/usr/lib/libcurses.so
-ln -sfv ../../lib/libncurses.so.&ncurses-version2; ${CLFS}/usr/lib/libncurses.so
-ln -sfv ../../lib/libmenu.so.&ncurses-version2; ${CLFS}/usr/lib/libmenu.so
-ln -sfv ../../lib/libpanel.so.&ncurses-version2; ${CLFS}/usr/lib/libpanel.so
-ln -sfv ../../lib/libform.so.&ncurses-version2; ${CLFS}/usr/lib/libform.so</userinput></screen>
-
- <para os="k">Give the Ncurses libraries execute permissions:</para>
-
-<screen os="l"><userinput>chmod -v 755 ${CLFS}/lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
+<screen os="j"><userinput>rm -v ${CLFS}/lib/lib{ncursesw,menuw,panelw,formw}.so
+ln -sfv ../../lib/libncursesw.so.&ncurses-version2; ${CLFS}/usr/lib/libncursesw.so
+ln -sfv ../../lib/libmenuw.so.&ncurses-version2; ${CLFS}/usr/lib/libmenuw.so
+ln -sfv ../../lib/libpanelw.so.&ncurses-version2; ${CLFS}/usr/lib/libpanelw.so
+ln -sfv ../../lib/libformw.so.&ncurses-version2; ${CLFS}/usr/lib/libformw.so</userinput></screen>
+
+ <para os="k">Now we will make our Ncurses compatible for older and non-widec compatible programs
+ can build properly:</para>
+
+<screen os="l"><userinput>for lib in curses ncurses form panel menu ; do
+ echo "INPUT(-l${lib}w)" > ${CLFS}/usr/lib/lib${lib}.so
+ ln -sfv lib${lib}w.a ${CLFS}/usr/lib/lib${lib}.a
+done
+ln -sfv libncursesw.so ${CLFS}/usr/lib/libcursesw.so
+ln -sfv libncursesw.a ${CLFS}/usr/lib/libcursesw.a
+ln -sfv libncurses++w.a ${CLFS}/usr/lib/libncurses++.a
+ln -sfv ncursesw5-config ${CLFS}/usr/bin/ncurses5-config</userinput></screen>
+
+ <para os="m">Now we will create a symlink for /usr/share/terminfo in
+ <filename class="directory">/usr/lib</filename> for compatibility:</para>
+
+<screen os="n"><userinput>ln -sfv ../../usr/share/terminfo ${CLFS}/usr/lib/terminfo</userinput></screen>
</sect2>
@@ -71,10 +89,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), tabs, tic, toe, tput, and tset</seg>
+ <seg>libcursesw.so (link to libncursesw.so), libformw.[a,so],
+ libmenuw.[a,so], libncurses++w.a, libncursesw.[a,so], and
+ libpanelw.[a,so]</seg>
</seglistitem>
</segmentedlist>
@@ -83,65 +102,171 @@
<?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="tabs">
+ <term><command>tabs</command></term>
+ <listitem>
+ <para>Sets and clears tab stops on a terminal</para>
+ <indexterm zone="ch-system-ncurses tabs">
+ <primary sortas="b-tabs">tabs</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: branches/clfs-sysroot/BOOK/final-system/hppa-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/hppa-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/hppa-chapter.xml Sat Jan 31 16:39:30 2009
@@ -27,7 +27,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: branches/clfs-sysroot/BOOK/final-system/x86-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/x86-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/x86-chapter.xml Sat Jan 31 16:39:30 2009
@@ -27,7 +27,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: 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 Sat Jan 31 16:39:30 2009
@@ -39,6 +39,10 @@
<listitem>
<para>Janurary 31, 2009</para>
<itemizedlist>
+ <listitem>
+ <para>[jciccone] - Ported the NCurses widec builds from trunk and
+ added the branch update patch.</para>
+ </listitem>
<listitem>
<para>[jciccone] - Added command to make Perl use system-installed
Zlib. Fixes ticket #201.</para>
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 Sat Jan 31 16:39:30 2009
@@ -136,6 +136,15 @@
</varlistentry>
<varlistentry>
+ <term>Ncurses Branch Update Patch - <token>&ncurses-branch_update-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink
+ url="&patches-root;&ncurses-branch_update-patch;"/></para>
+ <para>MD5 sum: <literal>&ncurses-branch_update-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Perl Cross Compile Patch - <token>&perl-cross_compile-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
Modified: branches/clfs-sysroot/BOOK/patches.ent
==============================================================================
--- branches/clfs-sysroot/BOOK/patches.ent (original)
+++ branches/clfs-sysroot/BOOK/patches.ent Sat Jan 31 16:39:30 2009
@@ -56,6 +56,10 @@
<!ENTITY ncurses-bashfix-patch-md5 "c6f7f2ab0ebaf7721ebeb266641352db">
<!ENTITY ncurses-bashfix-patch-size "4 KB">
+<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-6.patch">
+<!ENTITY ncurses-branch_update-patch-md5 "39811fc1a46d4d6cd7b546e57ea4f3b6">
+<!ENTITY ncurses-branch_update-patch-size "584 KB">
+
<!ENTITY perl-cross_compile-patch "perl-&perl-version;-cross_compile-5.patch">
<!ENTITY perl-cross_compile-patch-md5 "7bbb78618e2dd95987ad04c6c54a81c6">
<!ENTITY perl-cross_compile-patch-size "140 KB">
More information about the Clfs-commits
mailing list