[Clfs-commits] commit: r4446 - in /trunk/BOOK: final-system/common/ncurses.xml final-system/multilib/ncurses-64bit.xml final-system/multilib/ncurses-n32.xml final-system/multilib/ncurses.xml introduction/common/changelog.xml

svn at cross-lfs.org svn at cross-lfs.org
Sun Jan 11 11:14:24 PST 2009


Author: jim
Date: Sun Jan 11 19:14:23 2009
New Revision: 4446

Log:
Final phase of Ncurses fixes. Create backwards compatible symlinks.

Modified:
    trunk/BOOK/final-system/common/ncurses.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/introduction/common/changelog.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 19:14:23 2009
@@ -58,10 +58,24 @@
 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
+    <para os="l">Now we will make our Ncurses compatible for older and non-widec compatible programs
+    can build properly:</para>
+
+<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
+        echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
+        ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
+done
+ln -sfv libcurses.so /usr/lib/libcursesw.so
+ln -sfv libncurses.so /usr/lib/libcurses.so
+ln -sfv libncursesw.a /usr/lib/libcursesw.a
+ln -sfv libncurses.a /usr/lib/libcurses.a
+ln -sfv libncurses++w.a /usr/lib/libncurses++.a
+ln -sfv ncurses5-config /usr/bin/ncursesw5-config</userinput></screen>
+
+    <para os="n">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>
+<screen os="o"><userinput>ln -sfv ../../usr/share/terminfo /usr/lib/terminfo</userinput></screen>
 
   </sect2>
 

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 19:14:23 2009
@@ -62,7 +62,7 @@
     the multiarch wrapper and then wrap it:</para>
 
 <screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-64}
-ln -sv multiarch_wrapper /usr/bin/ncursesw5-config</userinput></screen>
+ln -svf multiarch_wrapper /usr/bin/ncurses5-config</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="ncurses.xml"
@@ -79,10 +79,26 @@
 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
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="ncurses.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
+        echo "INPUT(-l${lib}w)" > /usr/lib64/lib${lib}.so
+        ln -sfv lib${lib}w.a /usr/lib64/lib${lib}.a
+done
+ln -sfv libcurses.so /usr/lib64/libcursesw.so
+ln -sfv libncurses.so /usr/lib64/libcurses.so
+ln -sfv libncursesw.a /usr/lib64/libcursesw.a
+ln -sfv libncurses.a /usr/lib64/libcurses.a
+ln -sfv libncurses++w.a /usr/lib64/libncurses++.a
+ln -sfv ncurses5-config-64 /usr/bin/ncursesw5-config-64
+ln -sfv ncurses5-config /usr/bin/ncursesw5-config</userinput></screen>
+
+    <para os="n">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>
+<screen os="o"><userinput>ln -sfv ../../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 19:14:23 2009
@@ -78,10 +78,25 @@
 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
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="ncurses.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
+        echo "INPUT(-l${lib}w)" > /usr/lib32/lib${lib}.so
+        ln -sfv lib${lib}w.a /usr/lib32/lib${lib}.a
+done
+ln -sfv libcurses.so /usr/lib32/libcursesw.so
+ln -sfv libncurses.so /usr/lib32/libcurses.so
+ln -sfv libncursesw.a /usr/lib32/libcursesw.a
+ln -sfv libncurses.a /usr/lib32/libcurses.a
+ln -sfv libncurses++w.a /usr/lib32/libncurses++.a
+ln -sfv ncurses5-config-32 /usr/bin/ncursesw5-config-32</userinput></screen>
+
+    <para os="n">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>
+<screen os="o"><userinput>ln -sfv ../../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 19:14:23 2009
@@ -83,9 +83,24 @@
     href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
+<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
+        echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so
+        ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a
+done
+ln -sfv libcurses.so /usr/lib/libcursesw.so
+ln -sfv libncurses.so /usr/lib/libcurses.so
+ln -sfv libncursesw.a /usr/lib/libcursesw.a
+ln -sfv libncurses.a /usr/lib/libcurses.a
+ln -sfv libncurses++w.a /usr/lib/libncurses++.a
+ln -sfv ncurses5-config-32 /usr/bin/ncursesw5-config-32</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ncurses.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Sun Jan 11 19:14:23 2009
@@ -41,6 +41,9 @@
       <itemizedlist>
         <listitem>
           <para>[Jonathan] - Fixed mistaken from when STANDARD_STARTFILE_PREFIX was added.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Final phase of Ncurses fixes. Create backwards compatible symlinks.</para>
         </listitem>
       </itemizedlist>
     </listitem>




More information about the Clfs-commits mailing list