Changeset 058c1e7f for BOOK/final-system/multilib/xz-64bit.xml

Timestamp:

Dec 5, 2013, 9:28:37 PM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

b8e82b7

Parents:

f2f8eec

Message:

Prevent XZ from installing static libraries in /lib

File:

• BOOK/final-system/multilib/xz-64bit.xml (modified) (3 diffs)

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

@@ -26 +26 @@
     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"
@@ -44 +44 @@
     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"
@@ -58 +60 @@
     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>