Changeset 1718e20 for BOOK/final-system/multilib

Timestamp:

May 23, 2011, 3:04:49 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

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

Children:

cfb2026a

Parents:

30a199c (diff), 1ac2d0c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/final-system/common/kbd.xml

Location:

BOOK/final-system/multilib

Files:

• glib-64bit.xml (added)
• glib-n32.xml (added)
• glib.xml (added)
• kbd.xml (modified) (1 diff)
• pkg-config.xml (modified) (1 diff)
• xz-64bit.xml (modified) (1 diff)
• xz-n32.xml (modified) (1 diff)
• xz.xml (modified) (1 diff)

BOOK/final-system/multilib/kbd.xml

@@ -21 +21 @@
   <sect2 role="installation">
     <title>Installation of Kbd</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/pkg-config.xml

@@ -26 +26 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" \
+<screen os="b"><userinput>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include" \
+  GLIB_LIBS="-lglib-2.0" \
+  CC="gcc ${BUILD64}" \
   ./configure --prefix=/usr \
     --with-pc-path=/usr/share/pkgconfig </userinput></screen>
+
+    <variablelist os="bb">
+      <title>The meaning of the new configure option:</title>
+
+      <varlistentry>
+        <term><parameter>GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/libi64/glib-2.0/include"</parameter></term>
+        <term><parameter>GLIB_LIBS="-lglib-2.0"</parameter></term>
+        <listitem>
+          <para>Pkg-config no longer comes with Glib and because Pkg-config
+        has not been installed itself it needs to be told where Glib is.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

@@ -56 +56 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>mv -v /lib64/liblzma.a /usr/lib64</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 /lib64/liblzma.a /usr/lib64</userinput></screen>
 
   </sect2>

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

@@ -57 +57 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="j"><userinput>mv -v /lib32/liblzma.a /usr/lib32</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>
 
   </sect2>

BOOK/final-system/multilib/xz.xml

@@ -57 +57 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/xz.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    <para os="j">Move the static libraries to the proper location:</para>
+
+    <screen os="k"><userinput>mv -v /lib/liblzma.a /usr/lib</userinput></screen>
 
   </sect2>