Changeset 058c1e7f for BOOK/final-system/multilib

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

Location:

BOOK/final-system/multilib

Files:

• xz-64bit.xml (modified) (3 diffs)
• xz-n32.xml (modified) (3 diffs)
• xz.xml (modified) (2 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>

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

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

BOOK/final-system/multilib/xz.xml

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