Changeset 6463a01 for BOOK/final-system/multilib

Timestamp:

Feb 19, 2016, 8:06:03 PM (9 years ago)

Author:

Chris Staub <chris@…>

Branches:

master, systemd

Children:

57fc8e7

Parents:

3f72431

Message:

Modified Ncurses instructions to move fewer libs to /lib

Location:

BOOK/final-system/multilib

Files:

• ncurses-64bit.xml (modified) (2 diffs)
• ncurses-n32.xml (modified) (2 diffs)
• ncurses.xml (modified) (2 diffs)

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

@@ -39 +39 @@
 ./configure \
     --prefix=/usr \
-    --libdir=/lib64 \
+    --libdir=/usr/lib64 \
     --with-shared \
     --without-debug \
@@ -71 +71 @@
 ln -svf multiarch_wrapper /usr/bin/ncursesw6-config</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    <para os="h">Move the <filename class="libraryfile">libncursesw</filename>
+    shared library to <filename class="directory">/lib64</filename>
+    and create a new symlink in <filename class="directory">/usr/lib64</filename>:</para>
 
-<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>ln -svf ../../lib64/$(readlink /lib64/libncursesw.so) /usr/lib64/libncursesw.so
-ln -svf ../../lib64/$(readlink /lib64/libmenuw.so) /usr/lib64/libmenuw.so
-ln -svf ../../lib64/$(readlink /lib64/libpanelw.so) /usr/lib64/libpanelw.so
-ln -svf ../../lib64/$(readlink /lib64/libformw.so) /usr/lib64/libformw.so
-rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
+<screen os="i"><userinput>mv -v /usr/lib64/libncursesw.so.* /lib64
+ln -svf ../../lib64/$(readlink /usr/lib/libncursesw.so) /usr/lib64/libncursesw.so</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -40 +40 @@
 ./configure \
     --prefix=/usr \
-    --libdir=/lib32 \
+    --libdir=/usr/lib32 \
     --with-shared \
     --without-debug \
@@ -71 +71 @@
 <screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-n32}</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    <para os="h">Move the <filename class="libraryfile">libncursesw</filename>
+    shared library to <filename class="directory">/lib32</filename>
+    and create a new symlink in <filename class="directory">/usr/lib32</filename>:</para>
 
-<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>ln -svf ../../lib32/$(readlink /lib32/libncursesw.so) /usr/lib32/libncursesw.so
-ln -svf ../../lib32/$(readlink /lib32/libmenuw.so) /usr/lib32/libmenuw.so
-ln -svf ../../lib32/$(readlink /lib32/libpanelw.so) /usr/lib32/libpanelw.so
-ln -svf ../../lib32/$(readlink /lib32/libformw.so) /usr/lib32/libformw.so
-rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
+<screen os="i"><userinput>mv -v /usr/lib32/libncursesw.so.* /lib32
+ln -svf ../../lib32/$(readlink /usr/lib/libncursesw.so) /usr/lib32/libncursesw.so</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/ncurses.xml

@@ -40 +40 @@
 ./configure \
     --prefix=/usr \
-    --libdir=/lib \
+    --libdir=/usr/lib \
     --with-shared \
     --without-debug \
@@ -85 +85 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='l'])"/>