[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-546-g058c1e7
git
git at cross-lfs.org
Thu Dec 5 21:28:43 PST 2013
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, master has been updated
via 058c1e7f507df9a7b02b5f16b315f906237775af (commit)
from f2f8eecdf9cdf8395203ad2010dd1b52209b6cb5 (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 058c1e7f507df9a7b02b5f16b315f906237775af
Author: Chris Staub <chris at beaker67.com>
Date: Fri Dec 6 00:28:37 2013 -0500
Prevent XZ from installing static libraries in /lib
diff --git a/BOOK/final-system/common/xz.xml b/BOOK/final-system/common/xz.xml
index 031efa0..9eec02b 100644
--- a/BOOK/final-system/common/xz.xml
+++ b/BOOK/final-system/common/xz.xml
@@ -29,7 +29,7 @@
<para os="a">Prepare XZ-Utils for compilation:</para>
-<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
<para os="c">Compile the package:</para>
@@ -41,13 +41,19 @@
<para os="f">Install the programs:</para>
-<screen os="g"><userinput>make pkgconfigdir=/usr/lib/pkgconfig install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
<para os="h">Move the <filename>xz</filename> binary, and several symlinks
that point to it, into the /bin directory:</para>
<screen os="i"><userinput>mv -v /usr/bin/{xz,lzma,lzcat,unlzma,unxz,xzcat} /bin</userinput></screen>
+ <para os="j">Finally, move the shared library to a more appropriate
+ location, and recreate the symlink pointing to it:</para>
+
+<screen os="k"><userinput>mv -v /usr/lib/liblzma.so.* /lib
+ln -svf ../../lib/liblzma.so.&xz-version; /usr/lib/liblzma.so</userinput></screen>
+
</sect2>
<sect2 id="contents-xz" role="content">
@@ -59,10 +65,13 @@
<segtitle>Installed directories</segtitle>
<seglistitem>
- <seg>lzcat (link to xz), lzcmp (link to lzdiff), lzdiff, lzegrep (link to lzgrep),
- lzfgrep (link to lzgrep), lzgrep, lzless (link to lzmore), lzma (link to xz),
- lzmadec, lzmore, unlzma (link to xz), unxz (link to xz), xz, xzcat
- (link to xz), and xzdec</seg>
+ <seg>lzcat (link to xz), lzcmp (link to xzdiff), lzdiff (link to
+ xzdiff), lzegrep (link to xzgrep), lzfgrep (link to xzgrep), lzgrep
+ (link to xzgrep), lzless (link to xzless), lzma (link to xz), lzmadec,
+ lzmainfo, lzmore (link to xzmore), unlzma (link to xz), unxz (link to
+ xz), xz, xzcat (link to xz), xzcmp (link to xzdiff), xzdec, xzdiff,
+ xzegrep (link to xzgrep), xzfgrep (link to xzgrep), xzgrep, xzless,
+ and xzmore</seg>
<seg>liblzma.[a,so]</seg>
<seg>/usr/include/lzma, /usr/share/doc/xz</seg>
</seglistitem>
diff --git a/BOOK/final-system/multilib/xz-64bit.xml b/BOOK/final-system/multilib/xz-64bit.xml
index a6144bf..91655e8 100644
--- a/BOOK/final-system/multilib/xz-64bit.xml
+++ b/BOOK/final-system/multilib/xz-64bit.xml
@@ -25,7 +25,7 @@
href="xz.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="xz.xml"
@@ -43,7 +43,9 @@
href="xz.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="g"><userinput>make pkgconfigdir=/usr/lib64/pkgconfig install</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="xz.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/xz.xml"
@@ -57,7 +59,8 @@
href="xz.xml"
xpointer="xpointer(//*[@os='j'])"/>
- <screen os="k"><userinput>mv -v /lib64/liblzma.a /usr/lib64</userinput></screen>
+<screen os="k"><userinput>mv -v /usr/lib64/liblzma.so.* /lib64
+ln -svf ../../lib64/liblzma.so.&xz-version; /usr/lib64/liblzma.so</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/xz-n32.xml b/BOOK/final-system/multilib/xz-n32.xml
index bb3dd6a..22cdcf4 100644
--- a/BOOK/final-system/multilib/xz-n32.xml
+++ b/BOOK/final-system/multilib/xz-n32.xml
@@ -26,7 +26,7 @@
href="xz.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="xz.xml"
@@ -44,13 +44,14 @@
href="xz.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="g"><userinput>make pkgconfigdir=/usr/lib32/pkgconfig install</userinput></screen>
+<screen os="g"><userinput>make install</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="xz.xml"
xpointer="xpointer(//*[@os='j'])"/>
-<screen os="k"><userinput>mv -v /lib32/liblzma.a /usr/lib32</userinput></screen>
+<screen os="k"><userinput>mv -v /usr/lib32/liblzma.so.* /lib32
+ln -svf ../../lib32/liblzma.so.&xz-version; /usr/lib32/liblzma.so</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/multilib/xz.xml b/BOOK/final-system/multilib/xz.xml
index d0ad20a..84fb1c3 100644
--- a/BOOK/final-system/multilib/xz.xml
+++ b/BOOK/final-system/multilib/xz.xml
@@ -26,7 +26,7 @@
href="../common/xz.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr --libdir=/lib</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/xz.xml"
@@ -48,9 +48,13 @@
href="../common/xz.xml"
xpointer="xpointer(//*[@os='g'])"/>
- <para os="j">Move the static libraries to the proper location:</para>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/xz.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
- <screen os="k"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/xz.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
</sect2>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 1d1be33..99b6f1b 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,16 @@
-->
<listitem>
+ <para>06 December 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Modified XZ instructions so that it won't install
+ liblzma.{a,la} in /lib.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>04 December 2013</para>
<itemizedlist>
<listitem>
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/common/xz.xml | 21 +++++++++++++++------
BOOK/final-system/multilib/xz-64bit.xml | 9 ++++++---
BOOK/final-system/multilib/xz-n32.xml | 7 ++++---
BOOK/final-system/multilib/xz.xml | 10 +++++++---
BOOK/introduction/common/changelog.xml | 10 ++++++++++
5 files changed, 42 insertions(+), 15 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list