Changeset 50af1be for BOOK

Timestamp:

Jan 11, 2009, 11:14:23 AM (16 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

9ba7bfe

Parents:

209cc86

Message:

Final phase of Ncurses fixes. Create backwards compatible symlinks.

Location:

BOOK

Files:

• final-system/common/ncurses.xml (modified) (1 diff)
• final-system/multilib/ncurses-64bit.xml (modified) (2 diffs)
• final-system/multilib/ncurses-n32.xml (modified) (1 diff)
• final-system/multilib/ncurses.xml (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)

BOOK/final-system/common/ncurses.xml

@@ -59 +59 @@
 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>

BOOK/final-system/multilib/ncurses-64bit.xml

@@ -63 +63 @@
 
 <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"
@@ -80 +80 @@
 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>

BOOK/final-system/multilib/ncurses-n32.xml

@@ -79 +79 @@
 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>

BOOK/final-system/multilib/ncurses.xml

@@ -84 +84 @@
     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>

BOOK/introduction/common/changelog.xml

@@ -42 +42 @@
         <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>