[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 27931b98636b4e727db2b509db97dd38aac4a16a
git
git at cross-lfs.org
Sun Jan 30 13:26:39 PST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 27931b98636b4e727db2b509db97dd38aac4a16a (commit)
via f586fdb211c05713992fd7428e1b9285b9232614 (commit)
from ff33e5628c733dc3dab518a226515df3cd3792ef (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 27931b98636b4e727db2b509db97dd38aac4a16a
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Jan 30 16:25:46 2011 -0500
Remove the hackery from E2fsprogs that allows it to bypass pkg-config
and just rely on pkg-config now that we have it.
diff --git a/BOOK/final-system/common/e2fsprogs.xml b/BOOK/final-system/common/e2fsprogs.xml
index 5ae6015..a6abb80 100644
--- a/BOOK/final-system/common/e2fsprogs.xml
+++ b/BOOK/final-system/common/e2fsprogs.xml
@@ -36,7 +36,7 @@ cd build</userinput></screen>
<para os="c">Prepare E2fsprogs for compilation:</para>
-<screen os="d"><userinput>PKG_CONFIG=true ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>../configure --prefix=/usr --with-root-prefix="" \
--enable-elf-shlibs --disable-libblkid \
--disable-libuuid --disable-fsck \
--disable-uuidd</userinput></screen>
@@ -70,8 +70,7 @@ cd build</userinput></screen>
<para os="f">Compile the package:</para>
-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
- LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</userinput></screen>
+<screen os="g"><userinput>make</userinput></screen>
<para os="h">To test the results, issue:
<userinput>make check</userinput>.</para>
diff --git a/BOOK/final-system/multilib/e2fsprogs-64bit.xml b/BOOK/final-system/multilib/e2fsprogs-64bit.xml
index 1845c48..1015442 100644
--- a/BOOK/final-system/multilib/e2fsprogs-64bit.xml
+++ b/BOOK/final-system/multilib/e2fsprogs-64bit.xml
@@ -38,8 +38,8 @@
href="e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG=true \
- ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
+ ../configure --prefix=/usr --with-root-prefix="" \
--enable-elf-shlibs --disable-libblkid \
--disable-libuuid --disable-fsck \
--disable-uuidd</userinput></screen>
diff --git a/BOOK/final-system/multilib/e2fsprogs-n32.xml b/BOOK/final-system/multilib/e2fsprogs-n32.xml
index 2ea7446..a3c9465 100644
--- a/BOOK/final-system/multilib/e2fsprogs-n32.xml
+++ b/BOOK/final-system/multilib/e2fsprogs-n32.xml
@@ -39,8 +39,8 @@
href="e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG=true \
- ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
+ ../configure --prefix=/usr --with-root-prefix="" \
--enable-elf-shlibs --disable-libblkid \
--disable-libuuid --disable-fsck \
--disable-uuidd</userinput></screen>
diff --git a/BOOK/final-system/multilib/e2fsprogs.xml b/BOOK/final-system/multilib/e2fsprogs.xml
index c9b3494..7d8c78a 100644
--- a/BOOK/final-system/multilib/e2fsprogs.xml
+++ b/BOOK/final-system/multilib/e2fsprogs.xml
@@ -34,8 +34,8 @@
href="../common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG=true \
- ../configure --prefix=/usr --with-root-prefix="" \
+<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
+ ../configure --prefix=/usr --with-root-prefix="" \
--enable-elf-shlibs --disable-libblkid \
--disable-libuuid --disable-fsck \
--disable-uuidd</userinput></screen>
commit f586fdb211c05713992fd7428e1b9285b9232614
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Jan 30 16:17:13 2011 -0500
Add Pkg-config 0.25.
diff --git a/BOOK/appendices/dependencies/common.xml b/BOOK/appendices/dependencies/common.xml
index e8fcef2..65327a1 100644
--- a/BOOK/appendices/dependencies/common.xml
+++ b/BOOK/appendices/dependencies/common.xml
@@ -399,7 +399,7 @@
<seglistitem>
<seg>Bash, Binutils, Coreutils, EGLIBC, Gawk, GCC, Gettext, Grep, Gzip,
- Make, Sed, Texinfo and Util-linux</seg>
+ Make, Pkg-config, Sed, Texinfo and Util-linux</seg>
</seglistitem>
</segmentedlist>
@@ -1197,6 +1197,34 @@
</seglistitem>
</segmentedlist>
+<!-- Begin Pkg-config dependency info -->
+ <bridgehead renderas="sect2" id="pkg-config-dep">Pkg-config</bridgehead>
+
+ <segmentedlist>
+ <segtitle>&dependencies;</segtitle>
+
+ <seglistitem>
+ <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep,
+ Make and Sed</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ <segmentedlist>
+ <segtitle>&testsuites;</segtitle>
+
+ <seglistitem>
+ <seg>None</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ <segmentedlist>
+ <segtitle>&before;</segtitle>
+
+ <seglistitem>
+ <seg>Util-linux, E2fsprogs</seg>
+ </seglistitem>
+ </segmentedlist>
+
<!-- Begin Procps dependency info -->
<bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead>
@@ -1511,7 +1539,7 @@
<seglistitem>
<seg>Bash, Binutils, Coreutils, EGLIBC, GCC, Grep,
- Make, Ncurses, Sed, Texinfo and Zlib</seg>
+ Make, Ncurses, Pkg-config, Sed, Texinfo and Zlib</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/alpha-chapter.xml b/BOOK/final-system/alpha-chapter.xml
index d3348ab..e57ca47 100644
--- a/BOOK/final-system/alpha-chapter.xml
+++ b/BOOK/final-system/alpha-chapter.xml
@@ -29,6 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/common/pkg-config.xml b/BOOK/final-system/common/pkg-config.xml
new file mode 100644
index 0000000..5810fa7
--- /dev/null
+++ b/BOOK/final-system/common/pkg-config.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-system-pkg-config" role="wrap">
+ <?dbhtml filename="pkg-config.html"?>
+
+ <title>Pkg-config-&pkg-config-version;</title>
+
+ <indexterm zone="ch-system-pkg-config">
+ <primary sortas="a-Pkg-config">Pkg-config</primary>
+ </indexterm>
+
+ <sect2 role="package">
+ <title/>
+
+ <para>Pkg-config is a tool to help you insert the correct compiler options
+ on the command line when compiling applications and libraries.</para>
+
+ </sect2>
+
+ <sect2 role="installation">
+ <title>Installation of Pkg-config</title>
+
+ <para os="a">Prepare Pkg-config for compilation:</para>
+
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+
+ <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+ <para os="e">To test the results, issue:
+ <userinput>make check</userinput>.</para>
+
+ <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
+
+ </sect2>
+
+ <sect2 id="contents-pkg-config" role="content">
+ <title>Contents of Pkg-config</title>
+
+ <segmentedlist>
+ <segtitle>Installed programs</segtitle>
+ <segtitle>Installed directory</segtitle>
+
+ <seglistitem>
+ <seg>pkg-config</seg>
+ <seg>/usr/share/doc/pkg-config</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ <variablelist>
+ <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+ <?dbfo list-presentation="list"?>
+ <?dbhtml list-presentation="table"?>
+
+ <varlistentry id="pkg-config">
+ <term><command>pkg-config</command></term>
+ <listitem>
+ <para>The <command>pkg-config</command> program is used to retrieve
+ information about installed libraries in the system. It is typically
+ used to compile and link against one or more libraries.</para>
+ <indexterm zone="ch-system-pkg-config pkg-config">
+ <primary sortas="b-pkg-config">pkg-config</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ </sect2>
+
+</sect1>
diff --git a/BOOK/final-system/mips-chapter.xml b/BOOK/final-system/mips-chapter.xml
index fed9b9c..63f4993 100644
--- a/BOOK/final-system/mips-chapter.xml
+++ b/BOOK/final-system/mips-chapter.xml
@@ -29,6 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/mips64-64-chapter.xml b/BOOK/final-system/mips64-64-chapter.xml
index 21cb9ac..b06c13c 100644
--- a/BOOK/final-system/mips64-64-chapter.xml
+++ b/BOOK/final-system/mips64-64-chapter.xml
@@ -29,6 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/mips64-chapter.xml b/BOOK/final-system/mips64-chapter.xml
index fc4cfc7..e46107f 100644
--- a/BOOK/final-system/mips64-chapter.xml
+++ b/BOOK/final-system/mips64-chapter.xml
@@ -44,6 +44,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>
diff --git a/BOOK/final-system/mips64/pkg-config.xml b/BOOK/final-system/mips64/pkg-config.xml
new file mode 100644
index 0000000..863a81f
--- /dev/null
+++ b/BOOK/final-system/mips64/pkg-config.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-system-pkg-config" role="wrap">
+ <?dbhtml filename="pkg-config.html"?>
+
+ <title>Pkg-config-&pkg-config-version;</title>
+
+ <indexterm zone="ch-system-pkg-config">
+ <primary sortas="a-Autoconf">Pkg-config</primary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Pkg-config</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../multilib/pkg-config.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../multilib/pkg-config.xml"
+ xpointer="xpointer(//*[@os='m1'])"/>
+
+<screen os="m2"><userinput>export PKG_CONFIG_PATH32="/usr/lib/pkgconfig"
+export PKG_CONFIG_PATHN32="/usr/lib32/pkgconfig"
+export PKG_CONFIG_PATH64="/usr/lib64/pkgconfig"</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../multilib/pkg-config.xml"
+ xpointer="xpointer(//*[@os='m3'])"/>
+
+<screen os="m4"><userinput>cat >> ${CLFS}/root/.bash_profile << EOF
+export PKG_CONFIG_PATH32="${PKG_CONFIG_PATH32}"
+export PKG_CONFIG_PATHN32="${PKG_CONFIG_PATHN32}"
+export PKG_CONFIG_PATH64="${PKG_CONFIG_PATH64}"
+EOF</userinput></screen>
+
+ </sect2>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(id('contents-pkg-config'))"/>
+
+</sect1>
diff --git a/BOOK/final-system/multilib/pkg-config.xml b/BOOK/final-system/multilib/pkg-config.xml
new file mode 100644
index 0000000..d740e57
--- /dev/null
+++ b/BOOK/final-system/multilib/pkg-config.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-system-pkg-config" role="wrap">
+ <?dbhtml filename="pkg-config.html"?>
+
+ <title>Pkg-config-&pkg-config-version;</title>
+
+ <indexterm zone="ch-system-pkg-config">
+ <primary sortas="a-Autoconf">Pkg-config</primary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Pkg-config</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+<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/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='f'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <para os="m1">On multilib builds the library direcory has been removed from
+ the default search path of <command>pkg-config</command>. Set some
+ environment variables to help set the path correctly in the future:</para>
+
+<screen os="m2"><userinput>export PKG_CONFIG_PATH32="/usr/lib/pkgconfig"
+export PKG_CONFIG_PATH64="/usr/lib64/pkgconfig"</userinput></screen>
+
+ <para os="m3">Export these variables to prevent any issues in the
+ future.</para>
+
+<screen os="m4"><userinput>cat >> ${CLFS}/root/.bash_profile << EOF
+export PKG_CONFIG_PATH32="${PKG_CONFIG_PATH32}"
+export PKG_CONFIG_PATH64="${PKG_CONFIG_PATH64}"
+EOF</userinput></screen>
+
+ </sect2>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/pkg-config.xml"
+ xpointer="xpointer(id('contents-pkg-config'))"/>
+
+</sect1>
diff --git a/BOOK/final-system/ppc-chapter.xml b/BOOK/final-system/ppc-chapter.xml
index 210e246..013fc75 100644
--- a/BOOK/final-system/ppc-chapter.xml
+++ b/BOOK/final-system/ppc-chapter.xml
@@ -29,6 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/ppc64-chapter.xml b/BOOK/final-system/ppc64-chapter.xml
index 8712159..2938aa8 100644
--- a/BOOK/final-system/ppc64-chapter.xml
+++ b/BOOK/final-system/ppc64-chapter.xml
@@ -38,6 +38,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/sparc-chapter.xml b/BOOK/final-system/sparc-chapter.xml
index 9bebd86..be8da0f 100644
--- a/BOOK/final-system/sparc-chapter.xml
+++ b/BOOK/final-system/sparc-chapter.xml
@@ -29,6 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/sparc64-64-chapter.xml b/BOOK/final-system/sparc64-64-chapter.xml
index b36c222..87754cf 100644
--- a/BOOK/final-system/sparc64-64-chapter.xml
+++ b/BOOK/final-system/sparc64-64-chapter.xml
@@ -29,6 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/sparc64-chapter.xml b/BOOK/final-system/sparc64-chapter.xml
index 6a2110f..c4e4a68 100644
--- a/BOOK/final-system/sparc64-chapter.xml
+++ b/BOOK/final-system/sparc64-chapter.xml
@@ -38,6 +38,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
diff --git a/BOOK/final-system/x86-chapter.xml b/BOOK/final-system/x86-chapter.xml
index e0c705c..04379dc 100644
--- a/BOOK/final-system/x86-chapter.xml
+++ b/BOOK/final-system/x86-chapter.xml
@@ -29,6 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/x86_64-64-chapter.xml b/BOOK/final-system/x86_64-64-chapter.xml
index ce5c6da..880aa7c 100644
--- a/BOOK/final-system/x86_64-64-chapter.xml
+++ b/BOOK/final-system/x86_64-64-chapter.xml
@@ -29,6 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index a686269..0e8b1ff 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -38,6 +38,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index b9f5861..ae56802 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,9 @@
<para>January 30, 2011</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Add Pkg-config 0.25.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Patch procps so that ps supports process control
groups.</para>
</listitem>
diff --git a/BOOK/materials/common/packages.xml b/BOOK/materials/common/packages.xml
index 3f509f9..6065bac 100644
--- a/BOOK/materials/common/packages.xml
+++ b/BOOK/materials/common/packages.xml
@@ -402,6 +402,15 @@
</varlistentry>
<varlistentry>
+ <term>Pkg-config (&pkg-config-version;) - <token>&pkg-config-size;</token>:</term>
+ <listitem>
+ <para>Home page: <ulink url="&pkg-config-home;"/></para>
+ <para>Download: <ulink url="&pkg-config-url;"/></para>
+ <para>MD5 sum: <literal>&pkg-config-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>PPL (&ppl-version;) - <token>&ppl-size;</token>:</term>
<listitem>
<para>Home page: <ulink url="&ppl-home;"/></para>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 043fdfe..87da926 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -321,6 +321,12 @@
<!ENTITY perl-md5 "7b018fe9c2f434eff0c629b4c515a8fc">
<!ENTITY perl-home "http://www.perl.org">
+<!ENTITY pkg-config-version "0.25">
+<!ENTITY pkg-config-size "968 KB">
+<!ENTITY pkg-config-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkg-config-version;.tar.gz">
+<!ENTITY pkg-config-md5 "a3270bab3f4b69b7dc6dbdacbcae9745">
+<!ENTITY pkg-config-home "http://pkgconfig.freedesktop.org/wiki/">
+
<!ENTITY powerpcutils-version "1.1.3">
<!ENTITY powerpcutils-size "24 KB">
<!ENTITY powerpcutils-url "http://ftp.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_&powerpcutils-version;.orig.tar.gz">
-----------------------------------------------------------------------
Summary of changes:
BOOK/appendices/dependencies/common.xml | 32 +++++++++-
BOOK/final-system/alpha-chapter.xml | 1 +
BOOK/final-system/common/e2fsprogs.xml | 5 +-
BOOK/final-system/common/pkg-config.xml | 79 ++++++++++++++++++++++++
BOOK/final-system/mips-chapter.xml | 1 +
BOOK/final-system/mips64-64-chapter.xml | 1 +
BOOK/final-system/mips64-chapter.xml | 1 +
BOOK/final-system/mips64/pkg-config.xml | 76 +++++++++++++++++++++++
BOOK/final-system/multilib/e2fsprogs-64bit.xml | 4 +-
BOOK/final-system/multilib/e2fsprogs-n32.xml | 4 +-
BOOK/final-system/multilib/e2fsprogs.xml | 4 +-
BOOK/final-system/multilib/pkg-config.xml | 73 ++++++++++++++++++++++
BOOK/final-system/ppc-chapter.xml | 1 +
BOOK/final-system/ppc64-chapter.xml | 1 +
BOOK/final-system/sparc-chapter.xml | 1 +
BOOK/final-system/sparc64-64-chapter.xml | 1 +
BOOK/final-system/sparc64-chapter.xml | 1 +
BOOK/final-system/x86-chapter.xml | 1 +
BOOK/final-system/x86_64-64-chapter.xml | 1 +
BOOK/final-system/x86_64-chapter.xml | 1 +
BOOK/introduction/common/changelog.xml | 3 +
BOOK/materials/common/packages.xml | 9 +++
BOOK/packages.ent | 6 ++
23 files changed, 296 insertions(+), 11 deletions(-)
create mode 100644 BOOK/final-system/common/pkg-config.xml
create mode 100644 BOOK/final-system/mips64/pkg-config.xml
create mode 100644 BOOK/final-system/multilib/pkg-config.xml
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list