[Clfs-commits] commit: r4453 - in /trunk/BOOK: final-system/common/lzma.xml final-system/multilib/lzma-64bit.xml final-system/multilib/lzma-n32.xml final-system/multilib/lzma.xml introduction/common/changelog.xml

svn at cross-lfs.org svn at cross-lfs.org
Mon Jan 12 15:52:13 PST 2009


Author: jim
Date: Mon Jan 12 23:52:13 2009
New Revision: 4453

Log:
Fixed LZMA Build see ticket 198.

Modified:
    trunk/BOOK/final-system/common/lzma.xml
    trunk/BOOK/final-system/multilib/lzma-64bit.xml
    trunk/BOOK/final-system/multilib/lzma-n32.xml
    trunk/BOOK/final-system/multilib/lzma.xml
    trunk/BOOK/introduction/common/changelog.xml

Modified: trunk/BOOK/final-system/common/lzma.xml
==============================================================================
--- trunk/BOOK/final-system/common/lzma.xml (original)
+++ trunk/BOOK/final-system/common/lzma.xml Mon Jan 12 23:52:13 2009
@@ -29,7 +29,7 @@
 
     <para os="a">Prepare LZMA-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>
 
@@ -38,20 +38,6 @@
     <para os="e">Install the programs:</para>
 
 <screen os="f"><userinput>make install</userinput></screen>
-
-    <para os="g">Move the LZMA-Utils static libraries to the proper location:</para>
-
-<screen os="h"><userinput>mv -v /lib/liblzmadec.{a,la} /usr/lib</userinput></screen>
-
-    <para os="i">Create a symlink for the shared library:</para>
-
-<screen os="j"><userinput>ln -svf ../../lib/liblzmadec.so.0 /usr/lib/liblzmadec.so</userinput></screen>
-
-    <para os="k">Move the <command>lzma</command> binary, and a couple
-    symlinks to it, to <filename class="directory">/bin</filename> to be
-    available like other compressing utilities:</para>
-
-<screen os="l"><userinput>mv -v /usr/bin/{lzma,lzcat,unlzma} /bin</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/final-system/multilib/lzma-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/lzma-64bit.xml (original)
+++ trunk/BOOK/final-system/multilib/lzma-64bit.xml Mon Jan 12 23:52:13 2009
@@ -25,7 +25,7 @@
     href="lzma.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b">CC="gcc ${BUILD64}"./configure --prefix=/usr libdir=/lib64<userinput></userinput></screen>
+<screen os="b">CC="gcc ${BUILD64}"./configure --prefix=/usr<userinput></userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="lzma.xml"
@@ -41,26 +41,6 @@
     href="lzma.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="lzma.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>mv -v /lib64/liblzmadec.{a,la} /usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="lzma.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>ln -sf ../../lib64/liblzmadec.so.0 /usr/lib64/liblzmadec.so</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
   </sect2>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/final-system/multilib/lzma-n32.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/lzma-n32.xml (original)
+++ trunk/BOOK/final-system/multilib/lzma-n32.xml Mon Jan 12 23:52:13 2009
@@ -26,7 +26,7 @@
     href="lzma.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b">CC="gcc ${BUILDN32}"./configure --prefix=/usr libdir=/lib32<userinput></userinput></screen>
+<screen os="b">CC="gcc ${BUILDN32}"./configure --prefix=/usr<userinput></userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="lzma.xml"
@@ -44,18 +44,6 @@
     href="lzma.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-<screen os="g"><userinput>mv -v /lib32/liblzmadec.{a,la} /usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="lzma.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="lzma.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>ln -sf ../../lib32/liblzmadec.so.0 /usr/lib32/liblzmadec.so</userinput></screen>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/final-system/multilib/lzma.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/lzma.xml (original)
+++ trunk/BOOK/final-system/multilib/lzma.xml Mon Jan 12 23:52:13 2009
@@ -44,22 +44,6 @@
     href="../common/lzma.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/lzma.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Mon Jan 12 23:52:13 2009
@@ -45,6 +45,11 @@
         <listitem>
           <para>[Jim] - Fixed E2fsprogs as stated in Ticket #197.</para>
         </listitem>
+        <listitem>
+          <para>[Jim] - Fixed LZMA from Ticket #198. LZMA utilizes C++ library. By standards
+	  it stays in /usr/lib. So we have modified our build to place LZMA in /usr/bin and not
+          /bin.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 
@@ -59,7 +64,7 @@
         </listitem>
         <listitem>
           <para>[Jim] - Fix for linking libreadline in 64 bit Inetutils.</para>
-        </listitem>
+       </listitem>
       </itemizedlist>
     </listitem>
 




More information about the Clfs-commits mailing list