Changeset 026bb5d for BOOK/final-system/multilib/pkg-config-lite.xml

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (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:

Updated simp branch to match main book

File:

• BOOK/final-system/multilib/pkg-config-lite.xml (moved) (moved from BOOK/final-system/multilib/pkg-config.xml ) (3 diffs)

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

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-pkg-config" role="wrap">
-  <?dbhtml filename="pkg-config.html"?>
+<sect1 id="ch-system-pkg-config-lite" role="wrap">
+  <?dbhtml filename="pkg-config-lite.html"?>
 
-  <title>Pkg-config-&pkg-config-version;</title>
+  <title>Pkg-config-lite-&pkg-config-lite-version;</title>
 
-  <indexterm zone="ch-system-pkg-config">
-    <primary sortas="a-Pkg-config">Pkg-config</primary>
+  <indexterm zone="ch-system-pkg-config-lite">
+    <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/pkg-config.xml"
+  href="../common/pkg-config-lite.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Pkg-config</title>
+    <title>Installation of Pkg-config-lite</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<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>
-
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
+    --with-pc-path=/usr/share/pkgconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
+    xpointer="xpointer(//*[@os='e2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/pkg-config.xml"
+    href="../common/pkg-config-lite.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
@@ -76 +63 @@
     future.</para>
 
-<screen os="m4"><userinput>cat &gt;&gt; ${CLFS}/root/.bash_profile &lt;&lt; EOF
+<screen os="m4"><userinput>cat &gt;&gt; /root/.bash_profile &lt;&lt; EOF
 export PKG_CONFIG_PATH32="${PKG_CONFIG_PATH32}"
 export PKG_CONFIG_PATH64="${PKG_CONFIG_PATH64}"
@@ -84 +71 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/pkg-config.xml"
-  xpointer="xpointer(id('contents-pkg-config'))"/>
+  href="../common/pkg-config-lite.xml"
+  xpointer="xpointer(id('contents-pkg-config-lite'))"/>
 
 </sect1>