[Clfs-commits] commit: r4929 - in /branches/clfs-sysroot/BOOK: ./ bootable/alpha/ bootable/arm/ bootable/hppa/ bootable/x86/ cross-tools/ cross-tools/common/ final-system/alpha/ final-system/arm/ final-system/common/ final-system/hppa/ final-system/x86/ introduction/common/
svn at cross-lfs.org
svn at cross-lfs.org
Sun Apr 12 14:13:26 PDT 2009
Author: jciccone
Date: Sun Apr 12 21:13:25 2009
New Revision: 4929
Log:
Added a sysroot wrapper.
Updated the build variables section of the book, each package uses its own.
Added:
branches/clfs-sysroot/BOOK/cross-tools/common/sysroot_wrapper.xml
Modified:
branches/clfs-sysroot/BOOK/bootable/alpha/kernel.xml
branches/clfs-sysroot/BOOK/bootable/arm/kernel.xml
branches/clfs-sysroot/BOOK/bootable/hppa/kernel.xml
branches/clfs-sysroot/BOOK/bootable/x86/kernel.xml
branches/clfs-sysroot/BOOK/cross-tools/alpha-chapter.xml
branches/clfs-sysroot/BOOK/cross-tools/arm-chapter.xml
branches/clfs-sysroot/BOOK/cross-tools/hppa-chapter.xml
branches/clfs-sysroot/BOOK/cross-tools/x86-chapter.xml
branches/clfs-sysroot/BOOK/final-system/alpha/perl.xml
branches/clfs-sysroot/BOOK/final-system/arm/perl.xml
branches/clfs-sysroot/BOOK/final-system/common/autoconf.xml
branches/clfs-sysroot/BOOK/final-system/common/automake.xml
branches/clfs-sysroot/BOOK/final-system/common/bash.xml
branches/clfs-sysroot/BOOK/final-system/common/binutils.xml
branches/clfs-sysroot/BOOK/final-system/common/bison.xml
branches/clfs-sysroot/BOOK/final-system/common/bzip2.xml
branches/clfs-sysroot/BOOK/final-system/common/coreutils.xml
branches/clfs-sysroot/BOOK/final-system/common/dhcpcd.xml
branches/clfs-sysroot/BOOK/final-system/common/diffutils.xml
branches/clfs-sysroot/BOOK/final-system/common/e2fsprogs.xml
branches/clfs-sysroot/BOOK/final-system/common/file.xml
branches/clfs-sysroot/BOOK/final-system/common/findutils.xml
branches/clfs-sysroot/BOOK/final-system/common/flex.xml
branches/clfs-sysroot/BOOK/final-system/common/gawk.xml
branches/clfs-sysroot/BOOK/final-system/common/gcc.xml
branches/clfs-sysroot/BOOK/final-system/common/gettext.xml
branches/clfs-sysroot/BOOK/final-system/common/gmp.xml
branches/clfs-sysroot/BOOK/final-system/common/grep.xml
branches/clfs-sysroot/BOOK/final-system/common/groff.xml
branches/clfs-sysroot/BOOK/final-system/common/gzip.xml
branches/clfs-sysroot/BOOK/final-system/common/iana-etc.xml
branches/clfs-sysroot/BOOK/final-system/common/iproute2.xml
branches/clfs-sysroot/BOOK/final-system/common/iputils.xml
branches/clfs-sysroot/BOOK/final-system/common/kbd.xml
branches/clfs-sysroot/BOOK/final-system/common/less.xml
branches/clfs-sysroot/BOOK/final-system/common/libtool.xml
branches/clfs-sysroot/BOOK/final-system/common/m4.xml
branches/clfs-sysroot/BOOK/final-system/common/make.xml
branches/clfs-sysroot/BOOK/final-system/common/man-pages.xml
branches/clfs-sysroot/BOOK/final-system/common/man.xml
branches/clfs-sysroot/BOOK/final-system/common/module-init-tools.xml
branches/clfs-sysroot/BOOK/final-system/common/mpfr.xml
branches/clfs-sysroot/BOOK/final-system/common/ncurses.xml
branches/clfs-sysroot/BOOK/final-system/common/patch.xml
branches/clfs-sysroot/BOOK/final-system/common/procps.xml
branches/clfs-sysroot/BOOK/final-system/common/psmisc.xml
branches/clfs-sysroot/BOOK/final-system/common/readline.xml
branches/clfs-sysroot/BOOK/final-system/common/rsyslog.xml
branches/clfs-sysroot/BOOK/final-system/common/sed.xml
branches/clfs-sysroot/BOOK/final-system/common/shadow.xml
branches/clfs-sysroot/BOOK/final-system/common/sysvinit.xml
branches/clfs-sysroot/BOOK/final-system/common/tar.xml
branches/clfs-sysroot/BOOK/final-system/common/texinfo.xml
branches/clfs-sysroot/BOOK/final-system/common/udev.xml
branches/clfs-sysroot/BOOK/final-system/common/util-linux-ng.xml
branches/clfs-sysroot/BOOK/final-system/common/variables.xml
branches/clfs-sysroot/BOOK/final-system/common/vim.xml
branches/clfs-sysroot/BOOK/final-system/common/xz.xml
branches/clfs-sysroot/BOOK/final-system/common/zlib.xml
branches/clfs-sysroot/BOOK/final-system/hppa/perl.xml
branches/clfs-sysroot/BOOK/final-system/x86/perl.xml
branches/clfs-sysroot/BOOK/general.ent
branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
Modified: branches/clfs-sysroot/BOOK/bootable/alpha/kernel.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/bootable/alpha/kernel.xml (original)
+++ branches/clfs-sysroot/BOOK/bootable/alpha/kernel.xml Sun Apr 12 21:13:25 2009
@@ -17,6 +17,10 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../arm/kernel.xml"
xpointer="xpointer(//*[@role='package'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../arm/kernel.xml"
+ xpointer="xpointer(//*[@role='build-env'])"/>
<sect2 role="installation">
<title>Installation of the kernel</title>
Modified: branches/clfs-sysroot/BOOK/bootable/arm/kernel.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/bootable/arm/kernel.xml (original)
+++ branches/clfs-sysroot/BOOK/bootable/arm/kernel.xml Sun Apr 12 21:13:25 2009
@@ -18,6 +18,8 @@
<para>The Linux package contains the Linux kernel.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of the kernel</title>
Modified: branches/clfs-sysroot/BOOK/bootable/hppa/kernel.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/bootable/hppa/kernel.xml (original)
+++ branches/clfs-sysroot/BOOK/bootable/hppa/kernel.xml Sun Apr 12 21:13:25 2009
@@ -17,6 +17,10 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../arm/kernel.xml"
xpointer="xpointer(//*[@role='package'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../arm/kernel.xml"
+ xpointer="xpointer(//*[@role='build-env'])"/>
<sect2 role="installation">
<title>Installation of the kernel</title>
Modified: branches/clfs-sysroot/BOOK/bootable/x86/kernel.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/bootable/x86/kernel.xml (original)
+++ branches/clfs-sysroot/BOOK/bootable/x86/kernel.xml Sun Apr 12 21:13:25 2009
@@ -17,6 +17,10 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../arm/kernel.xml"
xpointer="xpointer(//*[@role='package'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../arm/kernel.xml"
+ xpointer="xpointer(//*[@role='build-env'])"/>
<sect2 role="installation">
<title>Installation of the kernel</title>
Modified: branches/clfs-sysroot/BOOK/cross-tools/alpha-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/cross-tools/alpha-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/cross-tools/alpha-chapter.xml Sun Apr 12 21:13:25 2009
@@ -25,5 +25,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.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/sysroot_wrapper.xml"/>
</chapter>
Modified: branches/clfs-sysroot/BOOK/cross-tools/arm-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/cross-tools/arm-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/cross-tools/arm-chapter.xml Sun Apr 12 21:13:25 2009
@@ -25,5 +25,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.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/sysroot_wrapper.xml"/>
</chapter>
Modified: branches/clfs-sysroot/BOOK/cross-tools/hppa-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/cross-tools/hppa-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/cross-tools/hppa-chapter.xml Sun Apr 12 21:13:25 2009
@@ -25,5 +25,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.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/sysroot_wrapper.xml"/>
</chapter>
Modified: branches/clfs-sysroot/BOOK/cross-tools/x86-chapter.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/cross-tools/x86-chapter.xml (original)
+++ branches/clfs-sysroot/BOOK/cross-tools/x86-chapter.xml Sun Apr 12 21:13:25 2009
@@ -25,5 +25,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.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/sysroot_wrapper.xml"/>
</chapter>
Modified: branches/clfs-sysroot/BOOK/final-system/alpha/perl.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/alpha/perl.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/alpha/perl.xml Sun Apr 12 21:13:25 2009
@@ -17,6 +17,10 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../arm/perl.xml"
xpointer="xpointer(//*[@role='package'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../arm/perl.xml"
+ xpointer="xpointer(//*[@role='build-env'])"/>
<sect2 role="installation">
<title>Installation of Perl</title>
Modified: branches/clfs-sysroot/BOOK/final-system/arm/perl.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/arm/perl.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/arm/perl.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
Language.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Perl</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/autoconf.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/autoconf.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/autoconf.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
can automatically configure source code.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Autoconf</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/automake.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/automake.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/automake.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
for use with Autoconf.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Automake</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/bash.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/bash.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/bash.xml Sun Apr 12 21:13:25 2009
@@ -20,6 +20,8 @@
<para>The Bash package contains the Bourne-Again SHell.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Bash</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/binutils.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/binutils.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/binutils.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
tools for handling object files.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Binutils</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/bison.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/bison.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/bison.xml Sun Apr 12 21:13:25 2009
@@ -20,6 +20,8 @@
<para>The Bison package contains a parser generator.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Bison</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/bzip2.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/bzip2.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/bzip2.xml Sun Apr 12 21:13:25 2009
@@ -23,6 +23,8 @@
<command>gzip</command>.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Bzip2</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/coreutils.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/coreutils.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/coreutils.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
basic system characteristics.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Coreutils</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/dhcpcd.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/dhcpcd.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/dhcpcd.xml Sun Apr 12 21:13:25 2009
@@ -20,6 +20,8 @@
<para>The DHCPCD package provides a DHCP Client for network configuration.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of DHCPCD</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/diffutils.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/diffutils.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/diffutils.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
between files or directories.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Diffutils</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/e2fsprogs.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/e2fsprogs.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/e2fsprogs.xml Sun Apr 12 21:13:25 2009
@@ -23,6 +23,8 @@
file system.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of E2fsprogs</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/file.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/file.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/file.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
a given file or files.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of File</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/findutils.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/findutils.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/findutils.xml Sun Apr 12 21:13:25 2009
@@ -23,6 +23,8 @@
find, but unreliable if the database has not been recently updated).</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Findutils</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/flex.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/flex.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/flex.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
recognize patterns in text.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Flex</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/gawk.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/gawk.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/gawk.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
files.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Gawk</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/gcc.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/gcc.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/gcc.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
the C and C++ compilers.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of GCC</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/gettext.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/gettext.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/gettext.xml Sun Apr 12 21:13:25 2009
@@ -23,6 +23,8 @@
language.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Gettext</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/gmp.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/gmp.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/gmp.xml Sun Apr 12 21:13:25 2009
@@ -20,8 +20,21 @@
<para>GMP is a library for arithmetic on arbitrary precision integers,
rational numbers, and floating-point numbers.</para>
+<!--
+ <para>This package requires compiler variables to be set for the target in the enviornment.</para>
+
+<screen><userinput>export CC="${CLFS_TARGET}-gcc"
+export CXX="${CLFS_TARGET}-g++"
+export AR="${CLFS_TARGET}-ar"
+export AS="${CLFS_TARGET}-as"
+export RANLIB="${CLFS_TARGET}-ranlib"
+export LD="${CLFS_TARGET}-ld"
+export STRIP="${CLFS_TARGET}-strip"</userinput></screen>
+-->
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of GMP</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/grep.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/grep.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/grep.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
files.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Grep</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/groff.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/groff.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/groff.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
text.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Groff</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/gzip.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/gzip.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/gzip.xml Sun Apr 12 21:13:25 2009
@@ -22,6 +22,8 @@
</sect2>
+ &env-target;
+
<sect2 role="installation">
<title>Installation of Gzip</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/iana-etc.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/iana-etc.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/iana-etc.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
protocols.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Iana-Etc</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/iproute2.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/iproute2.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/iproute2.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
IPV4-based networking.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of IPRoute2</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/iputils.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/iputils.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/iputils.xml Sun Apr 12 21:13:25 2009
@@ -20,6 +20,8 @@
<para>The IPutils package contains programs for basic networking.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of IPutils</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/kbd.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/kbd.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/kbd.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
utilities.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Kbd</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/less.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/less.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/less.xml Sun Apr 12 21:13:25 2009
@@ -20,6 +20,8 @@
<para>The Less package contains a text file viewer.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Less</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/libtool.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/libtool.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/libtool.xml Sun Apr 12 21:13:25 2009
@@ -22,6 +22,8 @@
interface.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Libtool</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/m4.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/m4.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/m4.xml Sun Apr 12 21:13:25 2009
@@ -20,6 +20,8 @@
<para>The M4 package contains a macro processor.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of M4</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/make.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/make.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/make.xml Sun Apr 12 21:13:25 2009
@@ -20,6 +20,8 @@
<para>The Make package contains a program for compiling packages.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Make</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/man-pages.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/man-pages.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/man-pages.xml Sun Apr 12 21:13:25 2009
@@ -20,6 +20,8 @@
<para>The Man-pages package contains over 1,200 man pages.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Man-pages</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/man.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/man.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/man.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
pages.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Man</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/module-init-tools.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/module-init-tools.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/module-init-tools.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
modules in Linux kernels greater than or equal to version 2.5.47.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Module-Init-Tools</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/mpfr.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/mpfr.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/mpfr.xml Sun Apr 12 21:13:25 2009
@@ -22,6 +22,8 @@
computations with correct rounding.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of MPFR</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/ncurses.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/ncurses.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/ncurses.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
handling of character screens.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Ncurses</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/patch.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/patch.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/patch.xml Sun Apr 12 21:13:25 2009
@@ -22,6 +22,8 @@
<command>diff</command> program.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Patch</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/procps.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/procps.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/procps.xml Sun Apr 12 21:13:25 2009
@@ -22,6 +22,8 @@
</sect2>
+ &env-target;
+
<sect2 role="installation">
<title>Installation of Procps</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/psmisc.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/psmisc.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/psmisc.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
about running processes.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Psmisc</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/readline.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/readline.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/readline.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
editing and history capabilities.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Readline</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/rsyslog.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/rsyslog.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/rsyslog.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
such as those given by the kernel when unusual things happen.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Rsyslog</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/sed.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/sed.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/sed.xml Sun Apr 12 21:13:25 2009
@@ -20,6 +20,8 @@
<para>The Sed package contains a stream editor.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Sed</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/shadow.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/shadow.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/shadow.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
secure way.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Shadow</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/sysvinit.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/sysvinit.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/sysvinit.xml Sun Apr 12 21:13:25 2009
@@ -20,6 +20,8 @@
running, and shutdown of the system.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Sysvinit</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/tar.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/tar.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/tar.xml Sun Apr 12 21:13:25 2009
@@ -19,8 +19,9 @@
<para>The Tar package contains an archiving program.</para>
+ </sect2>
- </sect2>
+ &env-target;
<sect2 role="installation">
<title>Installation of Tar</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/texinfo.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/texinfo.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/texinfo.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
converting info pages.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Texinfo</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/udev.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/udev.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/udev.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
nodes.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Udev</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/util-linux-ng.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/util-linux-ng.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/util-linux-ng.xml Sun Apr 12 21:13:25 2009
@@ -21,8 +21,9 @@
Among them are utilities for handling file systems, consoles, partitions,
and messages.</para>
-
</sect2>
+
+ &env-target;
<sect2 id="fhs-util-linux-ng" role="installation">
<title>FHS compliance notes</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/variables.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/variables.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/variables.xml Sun Apr 12 21:13:25 2009
@@ -10,28 +10,6 @@
<title>Build Variables</title>
- <para>Setup target-specific variables for the compiler
- and linkers:</para>
-
-<screen><userinput>export CC="${CLFS_TARGET}-gcc"
-export CXX="${CLFS_TARGET}-g++"
-export AR="${CLFS_TARGET}-ar"
-export AS="${CLFS_TARGET}-as"
-export RANLIB="${CLFS_TARGET}-ranlib"
-export LD="${CLFS_TARGET}-ld"
-export STRIP="${CLFS_TARGET}-strip"</userinput></screen>
-
- <para>Then add the build variables to <filename>~/.bashrc</filename> to
- prevent issues if you stop and come back later:</para>
-
-<screen><userinput>cat > config.cache << EOF
-export CC="${CC}"
-export CXX="${CXX}"
-export AR="${AR}"
-export AS="${AS}"
-export RANLIB="${RANLIB}"
-export LD="${LD}"
-export STRIP="${STRIP}"
-EOF</userinput></screen>
+ <para>Throughout this book, you will see a reference to different environment variables to be set and unset for different builds. The commands to set and unset the variables should be present on every page where compilation occurs. It may be unnecessary to run these commands each time as long as you're aware of what is set in your current enviornment.</para>
</sect1>
Modified: branches/clfs-sysroot/BOOK/final-system/common/vim.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/vim.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/vim.xml Sun Apr 12 21:13:25 2009
@@ -20,6 +20,8 @@
<para>The Vim package contains a powerful text editor.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Vim</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/xz.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/xz.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/xz.xml Sun Apr 12 21:13:25 2009
@@ -23,6 +23,8 @@
<command>gzip</command>.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of XZ-Utils</title>
Modified: branches/clfs-sysroot/BOOK/final-system/common/zlib.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/zlib.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/zlib.xml Sun Apr 12 21:13:25 2009
@@ -21,6 +21,8 @@
used by some programs.</para>
</sect2>
+
+ &env-target;
<sect2 role="installation">
<title>Installation of Zlib</title>
Modified: branches/clfs-sysroot/BOOK/final-system/hppa/perl.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/hppa/perl.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/hppa/perl.xml Sun Apr 12 21:13:25 2009
@@ -17,6 +17,10 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../arm/perl.xml"
xpointer="xpointer(//*[@role='package'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../arm/perl.xml"
+ xpointer="xpointer(//*[@role='build-env'])"/>
<sect2 role="installation">
<title>Installation of Perl</title>
Modified: branches/clfs-sysroot/BOOK/final-system/x86/perl.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/x86/perl.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/x86/perl.xml Sun Apr 12 21:13:25 2009
@@ -17,6 +17,10 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../arm/perl.xml"
xpointer="xpointer(//*[@role='package'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../arm/perl.xml"
+ xpointer="xpointer(//*[@role='build-env'])"/>
<sect2 role="installation">
<title>Installation of Perl</title>
Modified: branches/clfs-sysroot/BOOK/general.ent
==============================================================================
--- branches/clfs-sysroot/BOOK/general.ent (original)
+++ branches/clfs-sysroot/BOOK/general.ent Sun Apr 12 21:13:25 2009
@@ -49,3 +49,27 @@
<!ENTITY % uid-gid-entities SYSTEM "users_groups.ent">
%uid-gid-entities;
+
+<!ENTITY env-target ' <sect2 role="build-env">
+ <title>Environment Settings</title>
+
+ <para>This package requires compiler variables to be set for the target in the environment.</para>
+
+ <screen><userinput>export CC="${CLFS_TARGET}-gcc"
+export CXX="${CLFS_TARGET}-g++"
+export AR="${CLFS_TARGET}-ar"
+export AS="${CLFS_TARGET}-as"
+export RANLIB="${CLFS_TARGET}-ranlib"
+export LD="${CLFS_TARGET}-ld"
+export STRIP="${CLFS_TARGET}-strip"</userinput></screen>
+
+ </sect2>'>
+
+<!ENTITY env-host ' <sect2 role="build-env">
+ <title>Environment Settings</title>
+
+ <para>This package requires compiler variables to be set for the host system.</para>
+
+ <screen><userinput>unset CC CXX AR AS RANLIB LD STRIP</userinput></screen>
+
+ </sect2>'>
Modified: branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/introduction/common/changelog.xml (original)
+++ branches/clfs-sysroot/BOOK/introduction/common/changelog.xml Sun Apr 12 21:13:25 2009
@@ -35,6 +35,18 @@
</itemizedlist>
</listitem>
-->
+
+ <listitem>
+ <para>April 12, 2009</para>
+ <itemizedlist>
+ <listitem>
+ <para>[jciccone] - Add a sysroot wrapper.</para>
+ </listitem>
+ <listitem>
+ <para>[jciccone] - Updated the build variables.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>April 5, 2009</para>
More information about the Clfs-commits
mailing list