[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-sysvinit-249-gf7e4340
git
git at clfs.org
Fri Feb 19 13:44:53 PST 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, sysvinit has been updated
via f7e4340052f9eab581c44b681026a6e3600e04af (commit)
via 24d655dd4edb102ce3e10e9ec0ab229d66cec589 (commit)
via 870ba41a956111d5b03b5fd88e0bb52c12f25380 (commit)
from c0c70554644e07694946dce48ff1c870958bc231 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f7e4340052f9eab581c44b681026a6e3600e04af
Author: Chris Staub <chris at beaker67.com>
Date: Fri Feb 19 23:06:03 2016 -0500
Modified Ncurses instructions to move fewer libs to /lib
diff --git a/BOOK/final-system/common/ncurses.xml b/BOOK/final-system/common/ncurses.xml
index afce66c..9c8b8db 100644
--- a/BOOK/final-system/common/ncurses.xml
+++ b/BOOK/final-system/common/ncurses.xml
@@ -36,7 +36,6 @@
<screen os="b"><userinput>./configure \
--prefix=/usr \
- --libdir=/lib \
--with-shared \
--without-debug \
--enable-widec \
@@ -74,17 +73,12 @@
<screen os="g"><userinput>make install</userinput></screen>
- <para os="h">Move the Ncurses static libraries to the proper location:</para>
+ <para os="h">Move the <filename class="libraryfile">libncursesw</filename>
+ shared library to <filename class="directory">/lib</filename>
+ and create a new symlink in <filename class="directory">/usr/lib</filename>:</para>
-<screen os="i"><userinput>mv -v /lib/lib{panelw,menuw,formw,ncursesw,ncurses++w}.a /usr/lib</userinput></screen>
-
- <para os="j">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
-
-<screen os="k"><userinput>ln -svf ../../lib/$(readlink /lib/libncursesw.so) /usr/lib/libncursesw.so
-ln -svf ../../lib/$(readlink /lib/libmenuw.so) /usr/lib/libmenuw.so
-ln -svf ../../lib/$(readlink /lib/libpanelw.so) /usr/lib/libpanelw.so
-ln -svf ../../lib/$(readlink /lib/libformw.so) /usr/lib/libformw.so
-rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
+<screen os="i"><userinput>mv -v /usr/lib/libncursesw.so.* /lib
+ln -svf ../../lib/$(readlink /usr/lib/libncursesw.so) /usr/lib/libncursesw.so</userinput></screen>
<para os="l">Many packages that use Ncurses will compile just fine against
the widechar libraries, but won't know to look for them. Create linker
diff --git a/BOOK/final-system/multilib/ncurses-64bit.xml b/BOOK/final-system/multilib/ncurses-64bit.xml
index 6f035e0..1a0d7d0 100644
--- a/BOOK/final-system/multilib/ncurses-64bit.xml
+++ b/BOOK/final-system/multilib/ncurses-64bit.xml
@@ -38,7 +38,7 @@
<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
./configure \
--prefix=/usr \
- --libdir=/lib64 \
+ --libdir=/usr/lib64 \
--with-shared \
--without-debug \
--enable-widec \
@@ -70,19 +70,12 @@
<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-64}
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'])"/>
-
-<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>
+ <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="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"
href="ncurses.xml"
diff --git a/BOOK/final-system/multilib/ncurses-n32.xml b/BOOK/final-system/multilib/ncurses-n32.xml
index 7bf93d6..e109f3d 100644
--- a/BOOK/final-system/multilib/ncurses-n32.xml
+++ b/BOOK/final-system/multilib/ncurses-n32.xml
@@ -39,7 +39,7 @@
<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
./configure \
--prefix=/usr \
- --libdir=/lib32 \
+ --libdir=/usr/lib32 \
--with-shared \
--without-debug \
--enable-widec \
@@ -70,19 +70,12 @@
<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'])"/>
-
-<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>
+ <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="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"
href="ncurses.xml"
diff --git a/BOOK/final-system/multilib/ncurses.xml b/BOOK/final-system/multilib/ncurses.xml
index b3dfd5e..5b24369 100644
--- a/BOOK/final-system/multilib/ncurses.xml
+++ b/BOOK/final-system/multilib/ncurses.xml
@@ -39,7 +39,7 @@
<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
./configure \
--prefix=/usr \
- --libdir=/lib \
+ --libdir=/usr/lib \
--with-shared \
--without-debug \
--enable-widec \
@@ -84,14 +84,6 @@
<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'])"/>
<screen os="m"><userinput>for lib in ncurses form panel menu ; do
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index a84e675..5be61ad 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -45,9 +45,15 @@
</listitem>
<listitem>
<para>[Chris] - Removed commands to create libcurses* symlinks in
- Ncursese, as few packages now are likely to need them. Fixes ticket
+ Ncurses, as few packages now are likely to need them. Fixes ticket
<ulink url="&clfs-ticket-root;1102">#1102.</ulink></para>
</listitem>
+ <listitem>
+ <para>[Chris] - Modified Ncurses instructions to move fewer libs
+ to /lib{,32,64} as only libncursesw itself is needed there.Fixes
+ ticket
+ <ulink url="&clfs-ticket-root;1104">#1104.</ulink></para>
+ </listitem>
</itemizedlist>
</listitem>
commit 24d655dd4edb102ce3e10e9ec0ab229d66cec589
Author: Chris Staub <chris at beaker67.com>
Date: Fri Feb 19 22:56:24 2016 -0500
Corrected ticket number in Changelog entry
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index effd6f1..a84e675 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -46,7 +46,7 @@
<listitem>
<para>[Chris] - Removed commands to create libcurses* symlinks in
Ncursese, as few packages now are likely to need them. Fixes ticket
- <ulink url="&clfs-ticket-root;1091">#1091.</ulink></para>
+ <ulink url="&clfs-ticket-root;1102">#1102.</ulink></para>
</listitem>
</itemizedlist>
</listitem>
commit 870ba41a956111d5b03b5fd88e0bb52c12f25380
Author: Chris Staub <chris at beaker67.com>
Date: Fri Feb 19 22:52:44 2016 -0500
Removed libcurses symlinks from Ncurses pages
diff --git a/BOOK/final-system/common/ncurses.xml b/BOOK/final-system/common/ncurses.xml
index 3175374..afce66c 100644
--- a/BOOK/final-system/common/ncurses.xml
+++ b/BOOK/final-system/common/ncurses.xml
@@ -91,12 +91,10 @@ rm -v /lib/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
scripts and symbolic links to allow older and non-widec compatible
programs to build properly:</para>
-<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
+<screen os="m"><userinput>for lib in 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 libncursesw.so /usr/lib/libcursesw.so
-ln -sfv libncursesw.a /usr/lib/libcursesw.a
ln -sfv libncurses++w.a /usr/lib/libncurses++.a
ln -sfv ncursesw6-config /usr/bin/ncurses6-config</userinput></screen>
diff --git a/BOOK/final-system/multilib/ncurses-64bit.xml b/BOOK/final-system/multilib/ncurses-64bit.xml
index e331f01..6f035e0 100644
--- a/BOOK/final-system/multilib/ncurses-64bit.xml
+++ b/BOOK/final-system/multilib/ncurses-64bit.xml
@@ -88,12 +88,10 @@ rm -v /lib64/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
href="ncurses.xml"
xpointer="xpointer(//*[@os='l'])"/>
-<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
+<screen os="m"><userinput>for lib in 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 libncursesw.a /usr/lib64/libcursesw.a
ln -sfv libncurses++w.a /usr/lib64/libncurses++.a
ln -sfv ncursesw6-config-64 /usr/bin/ncurses6-config-64
ln -sfv ncursesw6-config /usr/bin/ncurses6-config</userinput></screen>
diff --git a/BOOK/final-system/multilib/ncurses-n32.xml b/BOOK/final-system/multilib/ncurses-n32.xml
index cc58461..7bf93d6 100644
--- a/BOOK/final-system/multilib/ncurses-n32.xml
+++ b/BOOK/final-system/multilib/ncurses-n32.xml
@@ -88,12 +88,10 @@ rm -v /lib32/lib{ncursesw,menuw,panelw,formw}.so</userinput></screen>
href="ncurses.xml"
xpointer="xpointer(//*[@os='l'])"/>
-<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
+<screen os="m"><userinput>for lib in 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 libncursesw.a /usr/lib32/libcursesw.a
ln -sfv libncurses++w.a /usr/lib32/libncurses++.a
ln -sfv ncursesw6-config-32 /usr/bin/ncurses6-config-32</userinput></screen>
diff --git a/BOOK/final-system/multilib/ncurses.xml b/BOOK/final-system/multilib/ncurses.xml
index cbcee78..b3dfd5e 100644
--- a/BOOK/final-system/multilib/ncurses.xml
+++ b/BOOK/final-system/multilib/ncurses.xml
@@ -94,12 +94,10 @@
href="../common/ncurses.xml"
xpointer="xpointer(//*[@os='l'])"/>
-<screen os="m"><userinput>for lib in curses ncurses form panel menu ; do
+<screen os="m"><userinput>for lib in 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 libncursesw.a /usr/lib/libcursesw.a
ln -sfv libncurses++w.a /usr/lib/libncurses++.a
ln -sfv ncursesw6-config-32 /usr/bin/ncurses6-config-32</userinput></screen>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 292e564..effd6f1 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -43,6 +43,11 @@
<para>[Chris] - Removed --disable-profile from Glibc instructions -
profiling is disabled by default.</para>
</listitem>
+ <listitem>
+ <para>[Chris] - Removed commands to create libcurses* symlinks in
+ Ncursese, as few packages now are likely to need them. Fixes ticket
+ <ulink url="&clfs-ticket-root;1091">#1091.</ulink></para>
+ </listitem>
</itemizedlist>
</listitem>
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/ncurses.xml | 20 ++++++--------------
BOOK/final-system/multilib/ncurses-64bit.xml | 23 +++++++----------------
BOOK/final-system/multilib/ncurses-n32.xml | 23 +++++++----------------
BOOK/final-system/multilib/ncurses.xml | 14 ++------------
BOOK/introduction/common/changelog.xml | 11 +++++++++++
5 files changed, 33 insertions(+), 58 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list