[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.1.0-1083-gf319d64
git
git at cross-lfs.org
Sun May 18 20:27:20 PDT 2014
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 f319d64a494544047d8e125e2672f6570cac041e (commit)
via 6c19f5e2617b3ad4910aa922c2ec6067d2cc54f6 (commit)
from 6eb13f41759932315febe3183d200b194ec98bad (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 f319d64a494544047d8e125e2672f6570cac041e
Author: Chris Staub <chris at beaker67.com>
Date: Sun May 18 23:23:56 2014 -0400
Replaced PKG_CONFIG vars with pkg-config-lite installed in /cross-tools
Conflicts:
BOOK/introduction/common/changelog.xml
Conflicts:
BOOK/introduction/common/changelog.xml
diff --git a/BOOK/cross-tools/common/pkg-config-lite.xml b/BOOK/cross-tools/common/pkg-config-lite.xml
new file mode 100644
index 0000000..d824721
--- /dev/null
+++ b/BOOK/cross-tools/common/pkg-config-lite.xml
@@ -0,0 +1,72 @@
+<?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-cross-tools-pkg-config-lite" role="wrap">
+ <?dbhtml filename="pkg-config-lite.html"?>
+
+ <title>Pkg-config-lite-&pkg-config-lite-version;</title>
+
+ <indexterm zone="ch-cross-tools-pkg-config-lite">
+ <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
+ <secondary>cross tools</secondary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/pkg-config-lite.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Pkg-config-lite</title>
+
+ <para os="a">Several packages in the temporary system will use
+ <command>pkg-config</command> to find various required and optional
+ dependencies. The problem is that this could result in those packages
+ finding libraries on the host system and trying to link against them,
+ which will not work. To avoid this problem, we will install
+ a <command>pkg-config</command> binary in
+ <filename class="directory">/cross-tools</filename> and configure it so
+ that it will look for Pkg-config files only in
+ <filename class="directory">/tools</filename>.</para>
+
+ <para os="b">Prepare Pkg-config-lite for compilation:</para>
+
+<screen os="c"><userinput>./configure --prefix=/cross-tools \
+ --with-pc-path=/tools/lib/pkgconfig:/tools/share/pkgconfig</userinput></screen>
+
+ <variablelist os="d">
+ <title>The meaning of the new configure option:</title>
+
+ <varlistentry>
+ <term><parameter>--with-pc-path</parameter></term>
+ <listitem>
+ <para>This sets the default PKG_CONFIG_PATH to
+ <filename class="directory">/tools/lib/pkgconfig</filename> and
+ <filename class="directory">/tools/share/pkgconfig</filename>.</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ <para os="e">Compile the package:</para>
+
+<screen os="f"><userinput>make</userinput></screen>
+
+ <para os="g">Install the package:</para>
+
+<screen os="h"><userinput>make install</userinput></screen>
+
+ </sect2>
+
+ <sect2 role="content">
+ <title/>
+
+ <para>Details on this package are located in <xref
+ linkend="contents-pkg-config-lite" role="."/></para>
+
+ </sect2>
+
+</sect1>
diff --git a/BOOK/cross-tools/multilib/pkg-config-lite.xml b/BOOK/cross-tools/multilib/pkg-config-lite.xml
new file mode 100644
index 0000000..65babc1
--- /dev/null
+++ b/BOOK/cross-tools/multilib/pkg-config-lite.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-cross-tools-pkg-config-lite" role="wrap">
+ <?dbhtml filename="pkg-config-lite.html"?>
+
+ <title>Pkg-config-lite-&pkg-config-lite-version;</title>
+
+ <indexterm zone="ch-cross-tools-pkg-config-lite">
+ <primary sortas="a-Pkg-config-lite">Pkg-config-lite</primary>
+ <secondary>cross tools</secondary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/pkg-config-lite.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Pkg-config-lite</title>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/pkg-config-lite.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/pkg-config-lite.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
+
+<screen os="c"><userinput>./configure --prefix=/cross-tools \
+ --with-pc-path=/tools/lib64/pkgconfig:/tools/share/pkgconfig</userinput></screen>
+
+ <variablelist os="d">
+ <title>The meaning of the new configure option:</title>
+
+ <varlistentry>
+ <term><parameter>--with-pc-path</parameter></term>
+ <listitem>
+ <para>This sets the default PKG_CONFIG_PATH to
+ <filename class="directory">/tools/lib64/pkgconfig</filename> and
+ <filename class="directory">/tools/share/pkgconfig</filename>.</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/pkg-config-lite.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <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-lite.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/pkg-config-lite.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ </sect2>
+
+ <sect2 role="content">
+ <title/>
+
+ <para>Details on this package are located in <xref
+ linkend="contents-pkg-config-lite" role="."/></para>
+
+ </sect2>
+
+</sect1>
commit 6c19f5e2617b3ad4910aa922c2ec6067d2cc54f6
Author: Chris Staub <chris at beaker67.com>
Date: Sun May 18 23:23:56 2014 -0400
Replaced PKG_CONFIG vars with pkg-config-lite installed in /cross-tools
diff --git a/BOOK/boot/64/e2fsprogs.xml b/BOOK/boot/64/e2fsprogs.xml
index c7cbb49..f502424 100644
--- a/BOOK/boot/64/e2fsprogs.xml
+++ b/BOOK/boot/64/e2fsprogs.xml
@@ -34,7 +34,7 @@
href="../common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
../configure --prefix=/tools --enable-elf-shlibs \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
@@ -48,9 +48,9 @@
href="../multilib/e2fsprogs.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
- LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" \
- LDFLAGS="-Wl,-rpath,/tools/lib"</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/e2fsprogs.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/e2fsprogs.xml"
diff --git a/BOOK/boot/64/eudev.xml b/BOOK/boot/64/eudev.xml
index 9ba2035..a2e2946 100644
--- a/BOOK/boot/64/eudev.xml
+++ b/BOOK/boot/64/eudev.xml
@@ -25,9 +25,7 @@
href="../common/eudev.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
- KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
- CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
--host=${CLFS_TARGET} --disable-introspection --disable-gtk-doc-html \
--disable-gudev --disable-keymap --with-firmware-path=/tools/lib/firmware \
--enable-libkmod</userinput></screen>
diff --git a/BOOK/boot/64/kmod.xml b/BOOK/boot/64/kmod.xml
index b72f1de..55ead76 100644
--- a/BOOK/boot/64/kmod.xml
+++ b/BOOK/boot/64/kmod.xml
@@ -34,10 +34,7 @@
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>PKG_CONFIG= liblzma_CFLAGS="-I/tools/include" \
- liblzma_LIBS="-L/tools/lib -llzma" \
- zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
- CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/boot/common/e2fsprogs.xml b/BOOK/boot/common/e2fsprogs.xml
index 4d4bdd5..23a1534 100644
--- a/BOOK/boot/common/e2fsprogs.xml
+++ b/BOOK/boot/common/e2fsprogs.xml
@@ -34,8 +34,7 @@
href="../../final-system/common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="aa"><userinput>PKG_CONFIG=true \
- ../configure --prefix=/tools \
+<screen os="aa"><userinput>../configure --prefix=/tools \
--enable-elf-shlibs --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
--disable-uuidd</userinput></screen>
@@ -57,8 +56,9 @@
href="../../final-system/common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
- LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/e2fsprogs.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/e2fsprogs.xml"
diff --git a/BOOK/boot/common/eudev.xml b/BOOK/boot/common/eudev.xml
index 07a48fa..a78099d 100644
--- a/BOOK/boot/common/eudev.xml
+++ b/BOOK/boot/common/eudev.xml
@@ -27,9 +27,7 @@
<para os="a">Prepare Eudev for compilation:</para>
-<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib -lblkid" \
- KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib -lkmod" \
- ./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+<screen os="b"><userinput>./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-introspection --disable-gtk-doc-html \
--disable-gudev --disable-keymap --with-firmware-path=/lib/firmware \
--enable-libkmod</userinput></screen>
diff --git a/BOOK/boot/common/kmod.xml b/BOOK/boot/common/kmod.xml
index 283c8f6..c1e4a9f 100644
--- a/BOOK/boot/common/kmod.xml
+++ b/BOOK/boot/common/kmod.xml
@@ -32,10 +32,7 @@ sed '/dirname_default_prefix /s@/lib/modules@/tools&@' \
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>PKG_CONFIG= liblzma_CFLAGS="-I/tools/include" \
- liblzma_LIBS="-L/tools/lib -llzma" \
- zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
- ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
<variablelist os="c">
diff --git a/BOOK/boot/multilib/e2fsprogs.xml b/BOOK/boot/multilib/e2fsprogs.xml
index a78e7c9..0b6e181 100644
--- a/BOOK/boot/multilib/e2fsprogs.xml
+++ b/BOOK/boot/multilib/e2fsprogs.xml
@@ -40,7 +40,7 @@ sed -e "/libdir=.*\/lib/s@/lib@/lib64 at g" configure.orig > configure</userinpu
href="../common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
../configure --prefix=/tools --enable-elf-shlibs \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
@@ -54,9 +54,9 @@ sed -e "/libdir=.*\/lib/s@/lib@/lib64 at g" configure.orig > configure</userinpu
href="../common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
- LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" \
- LDFLAGS="-Wl,-rpath,/tools/lib64"</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/e2fsprogs.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/e2fsprogs.xml"
diff --git a/BOOK/boot/multilib/eudev.xml b/BOOK/boot/multilib/eudev.xml
index b4cf214..316ad35 100644
--- a/BOOK/boot/multilib/eudev.xml
+++ b/BOOK/boot/multilib/eudev.xml
@@ -25,9 +25,7 @@
href="../common/eudev.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>BLKID_CFLAGS="-I/tools/include" BLKID_LIBS="-L/tools/lib64 -lblkid" \
- KMOD_CFLAGS="-I/tools/include/" KMOD_LIBS="-L/tools/lib64 -lkmod" \
- CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools --build=${CLFS_HOST} \
--host=${CLFS_TARGET} --libdir=/tools/lib64 --with-rootlibdir=/tools/lib64 \
--disable-introspection --disable-gtk-doc-html --disable-gudev \
--disable-keymap --with-firmware-path=/lib/firmware --enable-libkmod</userinput></screen>
diff --git a/BOOK/boot/multilib/kmod.xml b/BOOK/boot/multilib/kmod.xml
index bb4893f..ccaa17c 100644
--- a/BOOK/boot/multilib/kmod.xml
+++ b/BOOK/boot/multilib/kmod.xml
@@ -34,10 +34,7 @@
href="../../final-system/common/kmod.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>PKG_CONFIG= liblzma_CFLAGS="-I/tools/include" \
- liblzma_LIBS="-L/tools/lib64 -llzma" \
- zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib64 -lz" \
- CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--libdir=/tools/lib64 --with-xz --with-zlib</userinput></screen>
diff --git a/BOOK/boot/ppc64/e2fsprogs-libs.xml b/BOOK/boot/ppc64/e2fsprogs-libs.xml
index 0379f89..928e82e 100644
--- a/BOOK/boot/ppc64/e2fsprogs-libs.xml
+++ b/BOOK/boot/ppc64/e2fsprogs-libs.xml
@@ -45,7 +45,7 @@ echo "ac_cv_sizeof_short=2" >> config.cache</userinput></screen>-->
href="../common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="aa"><userinput>CC="${CC} ${BUILD32}" PKG_CONFIG=true \
+<screen os="aa"><userinput>CC="${CC} ${BUILD32}" \
../configure --prefix=/tools --enable-elf-shlibs \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
@@ -59,8 +59,9 @@ echo "ac_cv_sizeof_short=2" >> config.cache</userinput></screen>-->
href="../64/e2fsprogs.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
- LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/e2fsprogs.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/e2fsprogs.xml"
diff --git a/BOOK/boot/ppc64/e2fsprogs.xml b/BOOK/boot/ppc64/e2fsprogs.xml
index f05597e..17a91ca 100644
--- a/BOOK/boot/ppc64/e2fsprogs.xml
+++ b/BOOK/boot/ppc64/e2fsprogs.xml
@@ -53,7 +53,7 @@ echo "ac_cv_sizeof_short=2" >> config.cache</userinput></screen>-->
href="../common/e2fsprogs.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG=true \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" \
../configure --prefix=/tools --enable-elf-shlibs \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-libblkid --disable-libuuid --disable-fsck \
@@ -67,10 +67,8 @@ echo "ac_cv_sizeof_short=2" >> config.cache</userinput></screen>-->
href="../64/e2fsprogs.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
- LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid" libs
-make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" LIBBLKID="-lblkid" \
- STATIC_LIBBLKID="-lblkid" LDFLAGS="-Wl,-rpath,/tools/lib64" -C e2fsck/</userinput></screen>
+<screen os="g"><userinput>make libs
+make -C e2fsck/</userinput></screen>
<para os="i">Install the e2fsck binary:</para>
diff --git a/BOOK/cross-tools/mips-chapter.xml b/BOOK/cross-tools/mips-chapter.xml
index 79f40a1..f417c66 100644
--- a/BOOK/cross-tools/mips-chapter.xml
+++ b/BOOK/cross-tools/mips-chapter.xml
@@ -19,6 +19,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/cross-tools/mips64-64-chapter.xml b/BOOK/cross-tools/mips64-64-chapter.xml
index 89aca26..6d23a8a 100644
--- a/BOOK/cross-tools/mips64-64-chapter.xml
+++ b/BOOK/cross-tools/mips64-64-chapter.xml
@@ -20,6 +20,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/cross-tools/mips64-chapter.xml b/BOOK/cross-tools/mips64-chapter.xml
index 6d583ba..db4e3d9 100644
--- a/BOOK/cross-tools/mips64-chapter.xml
+++ b/BOOK/cross-tools/mips64-chapter.xml
@@ -20,6 +20,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/cross-tools/ppc-chapter.xml b/BOOK/cross-tools/ppc-chapter.xml
index 6a0b531..2f44778 100644
--- a/BOOK/cross-tools/ppc-chapter.xml
+++ b/BOOK/cross-tools/ppc-chapter.xml
@@ -19,6 +19,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/cross-tools/ppc64-64-chapter.xml b/BOOK/cross-tools/ppc64-64-chapter.xml
index e60ea7e..508b6d9 100644
--- a/BOOK/cross-tools/ppc64-64-chapter.xml
+++ b/BOOK/cross-tools/ppc64-64-chapter.xml
@@ -20,6 +20,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/cross-tools/ppc64-chapter.xml b/BOOK/cross-tools/ppc64-chapter.xml
index 27559a4..995b288 100644
--- a/BOOK/cross-tools/ppc64-chapter.xml
+++ b/BOOK/cross-tools/ppc64-chapter.xml
@@ -20,6 +20,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/cross-tools/sparc-chapter.xml b/BOOK/cross-tools/sparc-chapter.xml
index 7d6ad83..86e8f3e 100644
--- a/BOOK/cross-tools/sparc-chapter.xml
+++ b/BOOK/cross-tools/sparc-chapter.xml
@@ -19,6 +19,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/cross-tools/sparc64-64-chapter.xml b/BOOK/cross-tools/sparc64-64-chapter.xml
index cb38e7c..344c9e1 100644
--- a/BOOK/cross-tools/sparc64-64-chapter.xml
+++ b/BOOK/cross-tools/sparc64-64-chapter.xml
@@ -20,6 +20,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/cross-tools/sparc64-chapter.xml b/BOOK/cross-tools/sparc64-chapter.xml
index fae988a..0802170 100644
--- a/BOOK/cross-tools/sparc64-chapter.xml
+++ b/BOOK/cross-tools/sparc64-chapter.xml
@@ -20,6 +20,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/cross-tools/x86-chapter.xml b/BOOK/cross-tools/x86-chapter.xml
index d653547..7d151bb 100644
--- a/BOOK/cross-tools/x86-chapter.xml
+++ b/BOOK/cross-tools/x86-chapter.xml
@@ -19,6 +19,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/cross-tools/x86_64-64-chapter.xml b/BOOK/cross-tools/x86_64-64-chapter.xml
index 0954b93..4db4d1b 100644
--- a/BOOK/cross-tools/x86_64-64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-64-chapter.xml
@@ -20,6 +20,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/cross-tools/x86_64-chapter.xml b/BOOK/cross-tools/x86_64-chapter.xml
index f124063..068953c 100644
--- a/BOOK/cross-tools/x86_64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-chapter.xml
@@ -20,6 +20,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gmp.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 1fbe25f..30f73dd 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -35,6 +35,17 @@
</itemizedlist>
</listitem>
-->
+
+ <listitem>
+ <para>18 May 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Added Pkg-config-lite to Cross-Tools and removed
+ PKG_CONFIG parameters from temp-system and boot packages.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>17 May 2014</para>
<itemizedlist>
diff --git a/BOOK/temp-system/64/check.xml b/BOOK/temp-system/64/check.xml
index 61d93c3..892f7b7 100644
--- a/BOOK/temp-system/64/check.xml
+++ b/BOOK/temp-system/64/check.xml
@@ -25,15 +25,11 @@
href="../common/check.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
+<screen os="d"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/check.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/check.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/64/util-linux.xml b/BOOK/temp-system/64/util-linux.xml
index 7edeb89..abcf7ac 100644
--- a/BOOK/temp-system/64/util-linux.xml
+++ b/BOOK/temp-system/64/util-linux.xml
@@ -26,7 +26,7 @@
href="../common/util-linux.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-makeinstall-chown --disable-makeinstall-setuid</userinput></screen>
diff --git a/BOOK/temp-system/common/check.xml b/BOOK/temp-system/common/check.xml
index ef36a19..2a035bb 100644
--- a/BOOK/temp-system/common/check.xml
+++ b/BOOK/temp-system/common/check.xml
@@ -26,23 +26,9 @@
<para os="c">Prepare Check for compilation:</para>
-<screen os="d"><userinput>PKG_CONFIG= ./configure --prefix=/tools \
+<screen os="d"><userinput>./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
- <variablelist os="e">
- <title>The meaning of the new configure option:</title>
-
- <varlistentry>
- <term><parameter>PKG_CONFIG=</parameter></term>
- <listitem>
- <para>Prevents check from using <command>pkg-config</command> to
- search for additional packages that may be on the host but
- won't exist inside the temporary build environment.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
<para os="f">Build the package:</para>
<screen os="g"><userinput>make</userinput></screen>
diff --git a/BOOK/temp-system/common/make.xml b/BOOK/temp-system/common/make.xml
index 3a71d35..2161b0b 100644
--- a/BOOK/temp-system/common/make.xml
+++ b/BOOK/temp-system/common/make.xml
@@ -26,7 +26,7 @@
href="../../final-system/common/make.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="aa"><userinput>PKG_CONFIG= ./configure --prefix=/tools \
+<screen os="aa"><userinput>./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/common/util-linux.xml b/BOOK/temp-system/common/util-linux.xml
index 061aa34..f865544 100644
--- a/BOOK/temp-system/common/util-linux.xml
+++ b/BOOK/temp-system/common/util-linux.xml
@@ -26,7 +26,7 @@
href="../../final-system/common/util-linux.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="b"><userinput>PKG_CONFIG= ./configure --prefix=/tools \
+<screen os="b"><userinput>./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--disable-makeinstall-chown --disable-makeinstall-setuid</userinput></screen>
diff --git a/BOOK/temp-system/multilib/check.xml b/BOOK/temp-system/multilib/check.xml
index a8cd9d2..b5eb933 100644
--- a/BOOK/temp-system/multilib/check.xml
+++ b/BOOK/temp-system/multilib/check.xml
@@ -25,15 +25,11 @@
href="../common/check.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
+<screen os="d"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} --libdir=/tools/lib64</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/check.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/check.xml"
xpointer="xpointer(//*[@os='f'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/multilib/make.xml b/BOOK/temp-system/multilib/make.xml
index 7aff7ce..758c1b3 100644
--- a/BOOK/temp-system/multilib/make.xml
+++ b/BOOK/temp-system/multilib/make.xml
@@ -26,7 +26,7 @@
href="../../final-system/common/make.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="aa"><userinput>PKG_CONFIG= CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+<screen os="aa"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/multilib/util-linux.xml b/BOOK/temp-system/multilib/util-linux.xml
index a983f0b..fa4c33e 100644
--- a/BOOK/temp-system/multilib/util-linux.xml
+++ b/BOOK/temp-system/multilib/util-linux.xml
@@ -26,7 +26,7 @@
href="../common/util-linux.xml"
xpointer="xpointer(//*[@os='a'])"/>
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
+<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
--build=${CLFS_HOST} --host=${CLFS_TARGET} \
--libdir='${prefix}'/lib64 --disable-makeinstall-chown \
--disable-makeinstall-setuid</userinput></screen>
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/64/e2fsprogs.xml | 8 +-
BOOK/boot/64/eudev.xml | 4 +-
BOOK/boot/64/kmod.xml | 5 +-
BOOK/boot/common/e2fsprogs.xml | 8 +-
BOOK/boot/common/eudev.xml | 4 +-
BOOK/boot/common/kmod.xml | 5 +-
BOOK/boot/multilib/e2fsprogs.xml | 8 +-
BOOK/boot/multilib/eudev.xml | 4 +-
BOOK/boot/multilib/kmod.xml | 5 +-
BOOK/boot/ppc64/e2fsprogs-libs.xml | 7 +-
BOOK/boot/ppc64/e2fsprogs.xml | 8 +--
BOOK/cross-tools/common/pkg-config-lite.xml | 72 ++++++++++++++++++++
BOOK/cross-tools/mips-chapter.xml | 1 +
BOOK/cross-tools/mips64-64-chapter.xml | 1 +
BOOK/cross-tools/mips64-chapter.xml | 1 +
.../multilib/pkg-config-lite.xml | 58 ++++++++--------
BOOK/cross-tools/ppc-chapter.xml | 1 +
BOOK/cross-tools/ppc64-64-chapter.xml | 1 +
BOOK/cross-tools/ppc64-chapter.xml | 1 +
BOOK/cross-tools/sparc-chapter.xml | 1 +
BOOK/cross-tools/sparc64-64-chapter.xml | 1 +
BOOK/cross-tools/sparc64-chapter.xml | 1 +
BOOK/cross-tools/x86-chapter.xml | 1 +
BOOK/cross-tools/x86_64-64-chapter.xml | 1 +
BOOK/cross-tools/x86_64-chapter.xml | 1 +
BOOK/introduction/common/changelog.xml | 11 +++
BOOK/temp-system/64/check.xml | 6 +--
BOOK/temp-system/64/util-linux.xml | 2 +-
BOOK/temp-system/common/check.xml | 16 +----
BOOK/temp-system/common/make.xml | 2 +-
BOOK/temp-system/common/util-linux.xml | 2 +-
BOOK/temp-system/multilib/check.xml | 6 +--
BOOK/temp-system/multilib/make.xml | 2 +-
BOOK/temp-system/multilib/util-linux.xml | 2 +-
34 files changed, 157 insertions(+), 100 deletions(-)
create mode 100644 BOOK/cross-tools/common/pkg-config-lite.xml
copy BOOK/{final-system => cross-tools}/multilib/pkg-config-lite.xml (52%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list