gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-02-07 23:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl (Moody) 2022-06-29 22:20:16 +02:00
commit 0160d68e19
3 changed files with 82 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chapter01/changelog.xml
View File

@ -40,6 +40,16 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
<para>2022-06-29</para>
<itemizedlist>
<listitem>
<para>[pierre] - Generate shared C++ bindings for ncurses, instead
of generating and then removing the static ones.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>2022-06-14</para>
<itemizedlist>

46
chapter06/ncurses.xml
View File

@ -65,9 +65,10 @@ popd</userinput></screen>
--mandir=/usr/share/man \
--with-manpage-format=normal \
--with-shared \
--without-normal \
--with-cxx-shared \
--without-debug \
--without-ada \
--without-normal \
--disable-stripping \
--enable-widec</userinput></screen>
@ -83,6 +84,37 @@ popd</userinput></screen>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--with-shared</parameter></term>
<listitem>
<para>This makes Ncurses build and install shared C libraries.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--without-normal</parameter></term>
<listitem>
<para>This prevents Ncurses building and installing static C
libraries.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--without-debug</parameter></term>
<listitem>
<para>This prevents Ncurses building and installing debug
libraries.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--with-cxx-shared</parameter></term>
<listitem>
<para>This makes Ncurses build and install shared C++ bindings. It
also prevents it building and installing static C++ bindings.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--without-ada</parameter></term>
<listitem>
@ -115,14 +147,6 @@ popd</userinput></screen>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--without-normal</parameter></term>
<listitem>
<para>This switch disables building and installing most static libraries.
</para>
</listitem>
</varlistentry>
</variablelist>
<para>Compile the package:</para>
@ -133,12 +157,12 @@ popd</userinput></screen>
<screen><userinput remap="install">make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install
echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen>
<!--
<para>Remove an unneeded static library not handled by
<command>configure</command>:</para>
<screen><userinput remap="install">rm -v $LFS/usr/lib/libncurses++w.a</userinput></screen>
-->
<variablelist>
<title>The meaning of the install options:</title>

50
chapter08/ncurses.xml
View File

@ -48,6 +48,7 @@
--with-shared \
--without-debug \
--without-normal \
--with-cxx-shared \
--enable-pc-files \
--enable-widec \
--with-pkg-config-libdir=/usr/lib/pkgconfig</userinput></screen>
@ -56,16 +57,33 @@
<title>The meaning of the new configure options:</title>
<varlistentry>
<term><parameter>--enable-widec</parameter></term>
<term><parameter>--with-shared</parameter></term>
<listitem>
<para>This switch causes wide-character libraries (e.g., <filename
class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
to be built instead of normal ones (e.g., <filename
class="libraryfile">libncurses.so.&ncurses-version;</filename>).
These wide-character libraries are usable in both multibyte and
traditional 8-bit locales, while normal libraries work properly
only in 8-bit locales. Wide-character and normal libraries are
source-compatible, but not binary-compatible.</para>
<para>This makes Ncurses build and install shared C libraries.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--without-normal</parameter></term>
<listitem>
<para>This prevents Ncurses building and installing static C
libraries.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--without-debug</parameter></term>
<listitem>
<para>This prevents Ncurses building and installing debug
libraries.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>--with-cxx-shared</parameter></term>
<listitem>
<para>This makes Ncurses build and install shared C++ bindings. It
also prevents it building and installing static C++ bindings.</para>
</listitem>
</varlistentry>
@ -78,10 +96,16 @@
</varlistentry>
<varlistentry>
<term><parameter>--without-normal</parameter></term>
<term><parameter>--enable-widec</parameter></term>
<listitem>
<para>This switch disables building and installing most static libraries.
</para>
<para>This switch causes wide-character libraries (e.g., <filename
class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
to be built instead of normal ones (e.g., <filename
class="libraryfile">libncurses.so.&ncurses-version;</filename>).
These wide-character libraries are usable in both multibyte and
traditional 8-bit locales, while normal libraries work properly
only in 8-bit locales. Wide-character and normal libraries are
source-compatible, but not binary-compatible.</para>
</listitem>
</varlistentry>
@ -112,7 +136,7 @@
<screen><userinput remap="install">make DESTDIR=$PWD/dest install
install -vm755 dest/usr/lib/libncursesw.so.&ncurses-version; /usr/lib
rm -v dest/usr/lib/{libncursesw.so.&ncurses-version;,libncurses++w.a}
rm -v dest/usr/lib/libncursesw.so.&ncurses-version;
cp -av dest/* /</userinput></screen>
<para>Many applications still expect the linker to be able to find