Changeset 1ef890b for BOOK/final-system/multilib

Timestamp:

Jan 12, 2009, 3:52:13 PM (16 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

b33fd59

Parents:

8100441

Message:

Fixed LZMA Build see ticket 198.

Location:

BOOK/final-system/multilib

Files:

• lzma-64bit.xml (modified) (2 diffs)
• lzma-n32.xml (modified) (2 diffs)
• lzma.xml (modified) (1 diff)

BOOK/final-system/multilib/lzma-64bit.xml

@@ -26 +26 @@
     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"
@@ -42 +42 @@
     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>
 

BOOK/final-system/multilib/lzma-n32.xml

@@ -27 +27 @@
     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"
@@ -45 +45 @@
     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>
 

BOOK/final-system/multilib/lzma.xml

@@ -45 +45 @@
     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>