Changeset 943f225

Timestamp:

01/21/2024 04:27:45 PM (3 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.1, 12.1-rc1, multilib, trunk, xry111/arm64, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.1, xry111/mips64el, xry111/update-glibc

Children:

0253841d

Parents:

d282f88

git-author:

Xi Ruoyao <xry111@…> (01/19/2024 04:57:51 AM)

git-committer:

Xi Ruoyao <xry111@…> (01/21/2024 04:27:45 PM)

Message:

ncurses: Use symlinks instead of linker scripts

The effect will not change, but with symlinks ld can save some time
invoking open(), read(), etc. syscalls and parsing the linker scripts.

Note that I've also removed "libcursesw" symlink because this library
has never existed. Instead libcurses.so is created as a symlink
direct to libncursesw.so.

Files:

• chapter06/ncurses.xml (modified) (2 diffs)
• chapter08/ncurses.xml (modified) (3 diffs)

chapter06/ncurses.xml

@@ -157 +157 @@
 
 <screen><userinput remap="install">make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install
-echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so
+ln -sv libncursesw.so $LFS/usr/lib/libncurses.so
 sed -e 's/^#if.*XOPEN.*$/#if 1/' \
     -i $LFS/usr/include/curses.h</userinput></screen>
@@ -179 +179 @@
 
       <varlistentry>
-        <term><command>echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</command></term>
+        <term><command>ln -sv libncursesw.so $LFS/usr/lib/libncurses.so</command></term>
         <listitem>
           <para>The <filename>libncurses.so</filename> library is needed by
-          a few packages we will build soon. We create this small linker
-          script, as this is what is done in <xref
-          linkend="chapter-building-system"/>.</para>
+          a few packages we will build soon. We create this symlink to use
+          <filename>libncursesw.so</filename> as a replacement.</para>
         </listitem>
       </varlistentry>

chapter08/ncurses.xml

@@ -145 +145 @@
 
     <para>Many applications still expect the linker to be able to find
-    non-wide-character Ncurses libraries. Trick such applications into linking with
-    wide-character libraries by means of symlinks and linker scripts:</para>
+    non-wide-character Ncurses libraries. Trick such applications into
+    linking with wide-character libraries by means of symlinks
+    (note that the <filename class='extension'>.so</filename> links are
+    only safe with <filename>curses.h</filename> edited to always use the
+    wide-character ABI):</para>
 
 <screen><userinput remap="install">for lib in ncurses form panel menu ; do
-    rm -vf                    /usr/lib/lib${lib}.so
-    echo "INPUT(-l${lib}w)" &gt; /usr/lib/lib${lib}.so
-    ln -sfv ${lib}w.pc        /usr/lib/pkgconfig/${lib}.pc
+    ln -sfv lib${lib}w.so /usr/lib/lib${lib}.so
+    ln -sfv ${lib}w.pc    /usr/lib/pkgconfig/${lib}.pc
 done</userinput></screen>
 
@@ -158 +160 @@
     buildable:</para>
 
-<screen><userinput remap="install">rm -vf                     /usr/lib/libcursesw.so
-echo "INPUT(-lncursesw)" &gt; /usr/lib/libcursesw.so
-ln -sfv libncurses.so      /usr/lib/libcurses.so</userinput></screen>
+<screen><userinput remap="install">ln -sfv libncursesw.so /usr/lib/libcurses.so</userinput></screen>
 
     <para>If desired, install the Ncurses documentation:</para>
@@ -212 +212 @@
         </seg>
         <seg>
-           libcursesw.so (symlink and linker script to libncursesw.so),
+           libcurses.so (symlink),
+           libform.so (symlink),
            libformw.so,
+           libmenu.so (symlink),
            libmenuw.so,
+           libncurses.so (symlink),
            libncursesw.so,
            libncurses++w.so,
-           libpanelw.so, and their non-wide-character counterparts without "w"
-              in the library names.</seg>
+           libpanel.so (symlink),
+           and libpanelw.so,
+        </seg>
         <seg>
            /usr/share/tabset,