Changeset 7cb0700 for BOOK/final-system/multilib

Timestamp:

Jan 11, 2009, 2:08:38 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:

04076fe

Parents:

cd6642e

Message:

Only build one version of Ncurses.

Location:

BOOK/final-system/multilib

Files:

• ncurses-64bit.xml (modified) (3 diffs)
• ncurses-n32.xml (modified) (3 diffs)
• ncurses-widec-64bit.xml (deleted)
• ncurses-widec-n32.xml (deleted)
• ncurses-widec.xml (deleted)
• ncurses.xml (modified) (3 diffs)

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

@@ -36 +36 @@
 <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"
@@ -59 +59 @@
     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"
@@ -69 +69 @@
     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>

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

@@ -37 +37 @@
 <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"
@@ -60 +59 @@
     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"
@@ -69 +68 @@
     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>

BOOK/final-system/multilib/ncurses.xml

@@ -37 +37 @@
 <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"
@@ -60 +59 @@
     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"
@@ -81 +80 @@
     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>