[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.1.0-1090-g5585711
git
git at cross-lfs.org
Tue May 20 10:18:00 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 55857113c2c3514aedbcc6f1195ebca86823812f (commit)
from 40e95182ddc60bbc014efacf133cfd4b461d19e9 (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 55857113c2c3514aedbcc6f1195ebca86823812f
Author: Chris Staub <chris at beaker67.com>
Date: Tue May 20 13:17:36 2014 -0400
Merged Build Flags pages with Build Variables, and moved those to final-preps
diff --git a/BOOK/chroot/sparc64-64/flags.xml b/BOOK/chroot/sparc64-64/flags.xml
index e871461..6d2b6cf 100644
--- a/BOOK/chroot/sparc64-64/flags.xml
+++ b/BOOK/chroot/sparc64-64/flags.xml
@@ -21,11 +21,11 @@
<screen><userinput>echo export BUILD64=\""${BUILD64}\"" >> ~/.bash_profile</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../cross-tools/sparc64-64/flags.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../../final-preps/sparc64-64/variables.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../cross-tools/sparc64-64/flags.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../../final-preps/sparc64-64/variables.xml"
+ xpointer="xpointer(//*[@os='l'])"/>
</sect1>
diff --git a/BOOK/chroot/sparc64/flags.xml b/BOOK/chroot/sparc64/flags.xml
index 8065b0e..dbdf08e 100644
--- a/BOOK/chroot/sparc64/flags.xml
+++ b/BOOK/chroot/sparc64/flags.xml
@@ -30,11 +30,11 @@ export CLFS_TARGET32="${CLFS_TARGET32}"
EOF</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../cross-tools/sparc64/flags.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../../final-preps/sparc64/variables.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../cross-tools/sparc64/flags.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../../final-preps/sparc64/variables.xml"
+ xpointer="xpointer(//*[@os='l'])"/>
</sect1>
diff --git a/BOOK/cross-tools/64/flags.xml b/BOOK/cross-tools/64/flags.xml
deleted file mode 100644
index b080b7c..0000000
--- a/BOOK/cross-tools/64/flags.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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-flags">
- <?dbhtml filename="flags.html"?>
-
- <title>Build Flags</title>
-
- <para os="a">We will need to setup target specific flags for the compiler
- and linkers.</para>
-
- <screen os="b"><userinput>export BUILD64="-m64"</userinput></screen>
-
- <para os="c">Now add the build flags to <filename>~/.bashrc</filename> to
- prevent issues if we stop and come back later.</para>
-
- <screen os="d"><userinput>echo export BUILD64=\""${BUILD64}\"" >> ~/.bashrc</userinput></screen>
-
-</sect1>
diff --git a/BOOK/cross-tools/mips-chapter.xml b/BOOK/cross-tools/mips-chapter.xml
index eea390f..d9c8f28 100644
--- a/BOOK/cross-tools/mips-chapter.xml
+++ b/BOOK/cross-tools/mips-chapter.xml
@@ -12,7 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/mips64-64-chapter.xml b/BOOK/cross-tools/mips64-64-chapter.xml
index 059de14..ae2818b 100644
--- a/BOOK/cross-tools/mips64-64-chapter.xml
+++ b/BOOK/cross-tools/mips64-64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/mips64-64/flags.xml b/BOOK/cross-tools/mips64-64/flags.xml
deleted file mode 100644
index 90f2d81..0000000
--- a/BOOK/cross-tools/mips64-64/flags.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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-flags">
- <?dbhtml filename="flags.html"?>
-
- <title>Build Flags</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../64/flags.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD64="-mabi=64"</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../64/flags.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../64/flags.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
-</sect1>
diff --git a/BOOK/cross-tools/mips64-chapter.xml b/BOOK/cross-tools/mips64-chapter.xml
index 179eb4b..3d1bcce 100644
--- a/BOOK/cross-tools/mips64-chapter.xml
+++ b/BOOK/cross-tools/mips64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/mips64/flags.xml b/BOOK/cross-tools/mips64/flags.xml
deleted file mode 100644
index 1f31a0a..0000000
--- a/BOOK/cross-tools/mips64/flags.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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-flags">
- <?dbhtml filename="flags.html"?>
-
- <title>Build Flags</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/flags.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD32="-mabi=32"
-export BUILDN32="-mabi=n32"
-export BUILD64="-mabi=64"</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/flags.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>cat >> ~/.bashrc << EOF
-export BUILD32="${BUILD32}"
-export BUILDN32="${BUILDN32}"
-export BUILD64="${BUILD64}"
-EOF</userinput></screen>
-
-</sect1>
diff --git a/BOOK/cross-tools/multilib/flags.xml b/BOOK/cross-tools/multilib/flags.xml
deleted file mode 100644
index 785f8f1..0000000
--- a/BOOK/cross-tools/multilib/flags.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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-flags">
- <?dbhtml filename="flags.html"?>
-
- <title>Build Flags</title>
-
- <para os="a">We will need to setup target specific flags for the compiler
- and linker:</para>
-
-<screen os="b"><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
- <para os="c">Now add the build flags to <filename>~/.bashrc</filename> to
- prevent issues if we stop and come back later:</para>
-
-<screen os="d"><userinput>cat >> ~/.bashrc << EOF
-export BUILD32="${BUILD32}"
-export BUILD64="${BUILD64}"
-EOF</userinput></screen>
-
-</sect1>
diff --git a/BOOK/cross-tools/ppc-chapter.xml b/BOOK/cross-tools/ppc-chapter.xml
index e3175a1..56ead83 100644
--- a/BOOK/cross-tools/ppc-chapter.xml
+++ b/BOOK/cross-tools/ppc-chapter.xml
@@ -12,7 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/ppc64-64-chapter.xml b/BOOK/cross-tools/ppc64-64-chapter.xml
index 75c6023..f4833bd 100644
--- a/BOOK/cross-tools/ppc64-64-chapter.xml
+++ b/BOOK/cross-tools/ppc64-64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/ppc64-64/variables.xml b/BOOK/cross-tools/ppc64-64/variables.xml
deleted file mode 100644
index d8e2941..0000000
--- a/BOOK/cross-tools/ppc64-64/variables.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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-variables">
- <?dbhtml filename="variables.html"?>
-
- <title>Build Variables</title>
-
- <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
diff --git a/BOOK/cross-tools/ppc64-chapter.xml b/BOOK/cross-tools/ppc64-chapter.xml
index 0220cb9..44fbd70 100644
--- a/BOOK/cross-tools/ppc64-chapter.xml
+++ b/BOOK/cross-tools/ppc64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/sparc-chapter.xml b/BOOK/cross-tools/sparc-chapter.xml
index ffad18b..e6e38da 100644
--- a/BOOK/cross-tools/sparc-chapter.xml
+++ b/BOOK/cross-tools/sparc-chapter.xml
@@ -12,7 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/sparc64-64-chapter.xml b/BOOK/cross-tools/sparc64-64-chapter.xml
index 2e67dc6..1ee9a06 100644
--- a/BOOK/cross-tools/sparc64-64-chapter.xml
+++ b/BOOK/cross-tools/sparc64-64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/sparc64-64/flags.xml b/BOOK/cross-tools/sparc64-64/flags.xml
deleted file mode 100644
index 839c689..0000000
--- a/BOOK/cross-tools/sparc64-64/flags.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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-flags">
- <title>Build Flags</title>
- <?dbhtml filename="flags.html"?>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../64/flags.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
-export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../64/flags.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>cat >> ~/.bashrc << EOF
-export BUILD64="${BUILD64}"
-export GCCTARGET="${GCCTARGET}"
-EOF</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../sparc64/flags.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <table os="f">
- <title>List of architectures, target triplets, and recommended book</title>
- <?dbfo table-width="7in" ?>
-
- <tgroup cols="3">
-
- <colspec colnum="1" colwidth="1in" colname="Processor"/>
- <colspec colnum="2" colwidth="3.2in" colname="Build64"/>
- <colspec colnum="3" colwidth="2.8in" colname="GCC"/>
-
- <thead>
- <row>
- <entry>Processor</entry>
- <entry>BUILD64</entry>
- <entry>GCCTARGET</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry>Ultrasparc and Ultrasparc2</entry>
- <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
- <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
- </row>
- <row>
- <entry>Ultrasparc3</entry>
- <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
- <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
- </row>
- </tbody>
-
- </tgroup>
-
- </table>
-
-</sect1>
-
diff --git a/BOOK/cross-tools/sparc64-64/variables.xml b/BOOK/cross-tools/sparc64-64/variables.xml
deleted file mode 100644
index f1729c3..0000000
--- a/BOOK/cross-tools/sparc64-64/variables.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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-variables">
- <?dbhtml filename="variables.html"?>
-
- <title>Build Variables</title>
-
- <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../sparc64/variables.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
- <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
diff --git a/BOOK/cross-tools/sparc64-chapter.xml b/BOOK/cross-tools/sparc64-chapter.xml
index 6c9d0af..96f1e9e 100644
--- a/BOOK/cross-tools/sparc64-chapter.xml
+++ b/BOOK/cross-tools/sparc64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/x86-chapter.xml b/BOOK/cross-tools/x86-chapter.xml
index 35a282d..b7d4a75 100644
--- a/BOOK/cross-tools/x86-chapter.xml
+++ b/BOOK/cross-tools/x86-chapter.xml
@@ -12,7 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/x86_64-64-chapter.xml b/BOOK/cross-tools/x86_64-64-chapter.xml
index 7fccc50..91f126e 100644
--- a/BOOK/cross-tools/x86_64-64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/x86_64-chapter.xml b/BOOK/cross-tools/x86_64-chapter.xml
index 09f5186..0343b20 100644
--- a/BOOK/cross-tools/x86_64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/final-preps/aboutclfs.xml b/BOOK/final-preps/common/aboutclfs.xml
similarity index 96%
rename from BOOK/final-preps/aboutclfs.xml
rename to BOOK/final-preps/common/aboutclfs.xml
index b3124ef..3cf2124 100644
--- a/BOOK/final-preps/aboutclfs.xml
+++ b/BOOK/final-preps/common/aboutclfs.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/abouttestsuites.xml b/BOOK/final-preps/common/abouttestsuites.xml
similarity index 92%
rename from BOOK/final-preps/abouttestsuites.xml
rename to BOOK/final-preps/common/abouttestsuites.xml
index a597a44..8f40563 100644
--- a/BOOK/final-preps/abouttestsuites.xml
+++ b/BOOK/final-preps/common/abouttestsuites.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/addinguser.xml b/BOOK/final-preps/common/addinguser.xml
similarity index 98%
rename from BOOK/final-preps/addinguser.xml
rename to BOOK/final-preps/common/addinguser.xml
index 262500e..f4c499a 100644
--- a/BOOK/final-preps/addinguser.xml
+++ b/BOOK/final-preps/common/addinguser.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/creatingcrossdir.xml b/BOOK/final-preps/common/creatingcrossdir.xml
similarity index 95%
rename from BOOK/final-preps/creatingcrossdir.xml
rename to BOOK/final-preps/common/creatingcrossdir.xml
index f0fdc2a..4b2f00d 100644
--- a/BOOK/final-preps/creatingcrossdir.xml
+++ b/BOOK/final-preps/common/creatingcrossdir.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/creatingtoolsdir.xml b/BOOK/final-preps/common/creatingtoolsdir.xml
similarity index 97%
rename from BOOK/final-preps/creatingtoolsdir.xml
rename to BOOK/final-preps/common/creatingtoolsdir.xml
index ec27f39..ee3b7b3 100644
--- a/BOOK/final-preps/creatingtoolsdir.xml
+++ b/BOOK/final-preps/common/creatingtoolsdir.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/settingenviron.xml b/BOOK/final-preps/common/settingenviron.xml
similarity index 98%
rename from BOOK/final-preps/settingenviron.xml
rename to BOOK/final-preps/common/settingenviron.xml
index 0dfe24b..a0ae49b 100644
--- a/BOOK/final-preps/settingenviron.xml
+++ b/BOOK/final-preps/common/settingenviron.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/mips-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/mips-chapter.xml
index a1379f0..0c81e9d 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/mips-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/mips/variables.xml b/BOOK/final-preps/mips/variables.xml
similarity index 92%
rename from BOOK/cross-tools/mips/variables.xml
rename to BOOK/final-preps/mips/variables.xml
index 601b8d0..1acea46 100644
--- a/BOOK/cross-tools/mips/variables.xml
+++ b/BOOK/final-preps/mips/variables.xml
@@ -32,8 +32,10 @@
<screen os="ad"><userinput>export CLFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
+ href="../x86/variables.xml"
xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/mips64-64-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/mips64-64-chapter.xml
index a1379f0..983f35e 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/mips64-64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/mips64-64/variables.xml b/BOOK/final-preps/mips64-64/variables.xml
similarity index 77%
rename from BOOK/cross-tools/mips64-64/variables.xml
rename to BOOK/final-preps/mips64-64/variables.xml
index 2209bfc..7ff10a0 100644
--- a/BOOK/cross-tools/mips64-64/variables.xml
+++ b/BOOK/final-preps/mips64-64/variables.xml
@@ -41,11 +41,19 @@
xpointer="xpointer(//*[@os='ad'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>export BUILD64="-mabi=64"</userinput></screen>
+
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/mips64-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/mips64-chapter.xml
index a1379f0..5d5fa67 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/mips64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/mips64/variables.xml b/BOOK/final-preps/mips64/variables.xml
similarity index 72%
rename from BOOK/cross-tools/mips64/variables.xml
rename to BOOK/final-preps/mips64/variables.xml
index 0edd527..1df8dcf 100644
--- a/BOOK/cross-tools/mips64/variables.xml
+++ b/BOOK/final-preps/mips64/variables.xml
@@ -38,18 +38,31 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen os="m2"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
+ xpointer="xpointer(//*[@os='e'])"/>
- <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+<screen os="f"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>export BUILD32="-mabi=32"
+export BUILDN32="-mabi=n32"
+export BUILD64="-mabi=64"</userinput></screen>
+
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>cat >> ~/.bashrc << EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+export BUILD32="${BUILD32}"
+export BUILDN32="${BUILDN32}"
+export BUILD64="${BUILD64}"
+EOF</userinput></screen>
</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/ppc-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/ppc-chapter.xml
index a1379f0..a1d1729 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/ppc-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/ppc/variables.xml b/BOOK/final-preps/ppc/variables.xml
similarity index 91%
rename from BOOK/cross-tools/ppc/variables.xml
rename to BOOK/final-preps/ppc/variables.xml
index e12e8ca..862ac58 100644
--- a/BOOK/cross-tools/ppc/variables.xml
+++ b/BOOK/final-preps/ppc/variables.xml
@@ -26,8 +26,10 @@
<screen os="d"><userinput>export CLFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
+ href="../x86/variables.xml"
xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/ppc64-64-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/ppc64-64-chapter.xml
index a1379f0..efe5c1e 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/ppc64-64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/ppc64/variables.xml b/BOOK/final-preps/ppc64-64/variables.xml
similarity index 71%
rename from BOOK/cross-tools/ppc64/variables.xml
rename to BOOK/final-preps/ppc64-64/variables.xml
index 8a1584a..0cea81e 100644
--- a/BOOK/cross-tools/ppc64/variables.xml
+++ b/BOOK/final-preps/ppc64-64/variables.xml
@@ -27,17 +27,21 @@
<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='m1'])"/>
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
-<screen os="m2"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/ppc64-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/ppc64-chapter.xml
index a1379f0..ca9cb6f 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/ppc64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/sparc64/variables.xml b/BOOK/final-preps/ppc64/variables.xml
similarity index 67%
rename from BOOK/cross-tools/sparc64/variables.xml
rename to BOOK/final-preps/ppc64/variables.xml
index cc2f845..56cedc8 100644
--- a/BOOK/cross-tools/sparc64/variables.xml
+++ b/BOOK/final-preps/ppc64/variables.xml
@@ -24,22 +24,30 @@
href="../x86/variables.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='m1'])"/>
+ xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
-<screen os="m2"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
<bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='j'])"/>
</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/sparc-chapter.xml
similarity index 58%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/sparc-chapter.xml
index a1379f0..6ff03aa 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/sparc-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/sparc/variables.xml b/BOOK/final-preps/sparc/variables.xml
similarity index 91%
rename from BOOK/cross-tools/sparc/variables.xml
rename to BOOK/final-preps/sparc/variables.xml
index 063b756..a956b5e 100644
--- a/BOOK/cross-tools/sparc/variables.xml
+++ b/BOOK/final-preps/sparc/variables.xml
@@ -26,8 +26,10 @@
<screen os="d"><userinput>export CLFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
+ href="../x86/variables.xml"
xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/sparc64-64-chapter.xml
similarity index 58%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/sparc64-64-chapter.xml
index a1379f0..4846bc4 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/sparc64-64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/final-preps/sparc64-64/variables.xml b/BOOK/final-preps/sparc64-64/variables.xml
new file mode 100644
index 0000000..4c58d49
--- /dev/null
+++ b/BOOK/final-preps/sparc64-64/variables.xml
@@ -0,0 +1,90 @@
+<?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-variables">
+ <?dbhtml filename="variables.html"?>
+
+ <title>Build Variables</title>
+
+ <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../sparc64/variables.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <para os="g">We will need to setup target specific flags for the compiler
+ and linkers. You can choose the appropriate BUILD64 and GCCTARGET
+ from the table at the bottom of the page.</para>
+
+<screen os="h"><userinput>export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
+export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
+
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>cat >> ~/.bashrc << EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export BUILD64="${BUILD64}"
+export GCCTARGET="${GCCTARGET}"
+EOF</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../sparc64/variables.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
+
+ <table os="l">
+ <title>List of architectures, target triplets, and recommended book</title>
+ <?dbfo table-width="7in" ?>
+
+ <tgroup cols="3">
+
+ <colspec colnum="1" colwidth="1in" colname="Processor"/>
+ <colspec colnum="2" colwidth="3.2in" colname="Build64"/>
+ <colspec colnum="3" colwidth="2.8in" colname="GCC"/>
+
+ <thead>
+ <row>
+ <entry>Processor</entry>
+ <entry>BUILD64</entry>
+ <entry>GCCTARGET</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>Ultrasparc and Ultrasparc2</entry>
+ <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
+ <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
+ </row>
+ <row>
+ <entry>Ultrasparc3</entry>
+ <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
+ <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
+ </row>
+ </tbody>
+
+ </tgroup>
+
+ </table>
+
+</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/sparc64-chapter.xml
similarity index 58%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/sparc64-chapter.xml
index a1379f0..0ee7765 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/sparc64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/sparc64/flags.xml b/BOOK/final-preps/sparc64/variables.xml
similarity index 55%
rename from BOOK/cross-tools/sparc64/flags.xml
rename to BOOK/final-preps/sparc64/variables.xml
index 13ed98d..f26fa17 100644
--- a/BOOK/cross-tools/sparc64/flags.xml
+++ b/BOOK/final-preps/sparc64/variables.xml
@@ -5,34 +5,62 @@
%general-entities;
]>
-<sect1 id="ch-cross-tools-flags">
- <title>Build Flags</title>
- <?dbhtml filename="flags.html"?>
+<sect1 id="ch-cross-tools-variables">
+ <?dbhtml filename="variables.html"?>
- <para os="a">We will need to setup target specific flags for the compiler
- and linkers. You can choose the appropriate BUILD32 and BUILD64
+ <title>Build Variables</title>
+
+ <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
+
+ <para os="g">We will need to setup target specific flags for the compiler
+ and linkers. You can choose the appropriate BUILD32, BUILD64, and GCCTARGET
from the table at the bottom of the page.</para>
-<screen os="b"><userinput>export BUILD32="<replaceable>[BUILD32 entries]</replaceable>"
+<screen os="h"><userinput>export BUILD32="<replaceable>[BUILD32 entries]</replaceable>"
export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/flags.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
-<screen os="d"><userinput>cat >> ~/.bashrc << EOF
+<screen os="j"><userinput>cat >> ~/.bashrc << EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
export BUILD32="${BUILD32}"
export BUILD64="${BUILD64}"
export GCCTARGET="${GCCTARGET}"
EOF</userinput></screen>
- <para os="e">The following table gives the entires for different Sparc 64 capable
+ <para os="k">The following table gives the entries for different Sparc 64 capable
processors. Pick the processor that matches your system. Note: GCC settings are
only needed in the early sections of the book, and will not be used in the final-system
builds.</para>
- <table os="f">
+ <table os="l">
<title>List of 32-Bit settings, 64-Bit Build settings, and GCC setting</title>
<?dbfo table-width="7in" ?>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/x86-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/x86-chapter.xml
index a1379f0..40585b8 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/x86-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/x86/variables.xml b/BOOK/final-preps/x86/variables.xml
similarity index 100%
rename from BOOK/cross-tools/x86/variables.xml
rename to BOOK/final-preps/x86/variables.xml
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/x86_64-64-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/x86_64-64-chapter.xml
index a1379f0..c832352 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/x86_64-64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/x86_64-64/variables.xml b/BOOK/final-preps/x86_64-64/variables.xml
similarity index 74%
rename from BOOK/cross-tools/x86_64-64/variables.xml
rename to BOOK/final-preps/x86_64-64/variables.xml
index 6d24567..05a3f0e 100644
--- a/BOOK/cross-tools/x86_64-64/variables.xml
+++ b/BOOK/final-preps/x86_64-64/variables.xml
@@ -28,14 +28,22 @@
href="../x86_64/variables.xml"
xpointer="xpointer(//*[@os='d'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>export BUILD64="-m64"</userinput></screen>
+
<bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+<screen os="j"><userinput>cat >> ~/.bashrc << EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export BUILD64="${BUILD64}"
+EOF</userinput></screen>
</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/x86_64-chapter.xml
similarity index 52%
rename from BOOK/final-preps/chapter.xml
rename to BOOK/final-preps/x86_64-chapter.xml
index a1379f0..448f6d9 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/x86_64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/x86_64/variables.xml b/BOOK/final-preps/x86_64/variables.xml
similarity index 63%
rename from BOOK/cross-tools/x86_64/variables.xml
rename to BOOK/final-preps/x86_64/variables.xml
index 1828f6a..fad111c 100644
--- a/BOOK/cross-tools/x86_64/variables.xml
+++ b/BOOK/final-preps/x86_64/variables.xml
@@ -26,20 +26,28 @@
<screen os="d"><userinput>export CLFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
- <para os="m1">Now set the target triplet for 32 bits:</para>
+ <para os="e">Now set the target triplet for 32 bits:</para>
-<screen os="m2"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+<screen os="f"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+
+ <para os="g">We will need to setup target-specific flags for the compiler
+ and linker:</para>
+
+<screen os="h"><userinput>export BUILD32="-m32"
+export BUILD64="-m64"</userinput></screen>
<bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ <para os="i">Now add the host and target variables, and compiler and linker
+ flags, to <filename>~/.bashrc</filename>, just in case you have to exit and
+ restart building later:</para>
-<screen os="f"><userinput>cat >> ~/.bashrc << EOF
+<screen os="j"><userinput>cat >> ~/.bashrc << EOF
export CLFS_HOST="${CLFS_HOST}"
export CLFS_TARGET="${CLFS_TARGET}"
export CLFS_TARGET32="${CLFS_TARGET32}"
+export BUILD32="${BUILD32}"
+export BUILD64="${BUILD64}"
EOF</userinput></screen>
</sect1>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 388321a..9a7b81d 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -44,6 +44,11 @@
clfs user's default .bashrc, and removed the separate page where
this was done.</para>
</listitem>
+ <listitem>
+ <para>[Chris] - Removed separate "Build flags" pages and moved that
+ info to "Build Variables" pages, and moved those from cross-tools
+ to final-preps.</para>
+ </listitem>
</itemizedlist>
</listitem>
diff --git a/BOOK/mips-index.xml b/BOOK/mips-index.xml
index 9f82fd3..1cc283b 100644
--- a/BOOK/mips-index.xml
+++ b/BOOK/mips-index.xml
@@ -27,7 +27,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips-chapter.xml"/>
</part>
diff --git a/BOOK/mips64-64-index.xml b/BOOK/mips64-64-index.xml
index a155034..b8bdfb1 100644
--- a/BOOK/mips64-64-index.xml
+++ b/BOOK/mips64-64-index.xml
@@ -27,7 +27,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips64-64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips64-64-chapter.xml"/>
</part>
diff --git a/BOOK/mips64-index.xml b/BOOK/mips64-index.xml
index 602dc11..69aafc9 100644
--- a/BOOK/mips64-index.xml
+++ b/BOOK/mips64-index.xml
@@ -27,7 +27,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips64-chapter.xml"/>
</part>
diff --git a/BOOK/ppc-index.xml b/BOOK/ppc-index.xml
index 6d1eb07..ebb9c96 100644
--- a/BOOK/ppc-index.xml
+++ b/BOOK/ppc-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc-chapter.xml"/>
</part>
diff --git a/BOOK/ppc64-64-index.xml b/BOOK/ppc64-64-index.xml
index f5d19e2..adab454 100644
--- a/BOOK/ppc64-64-index.xml
+++ b/BOOK/ppc64-64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc64-64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc64-64-chapter.xml"/>
</part>
diff --git a/BOOK/ppc64-index.xml b/BOOK/ppc64-index.xml
index 439ad58..5c83835 100644
--- a/BOOK/ppc64-index.xml
+++ b/BOOK/ppc64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc64-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc64-chapter.xml"/>
</part>
diff --git a/BOOK/sparc-index.xml b/BOOK/sparc-index.xml
index a5bd30f..1fa6fe3 100644
--- a/BOOK/sparc-index.xml
+++ b/BOOK/sparc-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc-chapter.xml"/>
</part>
diff --git a/BOOK/sparc64-64-index.xml b/BOOK/sparc64-64-index.xml
index 1b4b3a5..8cb588a 100644
--- a/BOOK/sparc64-64-index.xml
+++ b/BOOK/sparc64-64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc64-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc64-64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc64-64-chapter.xml"/>
</part>
diff --git a/BOOK/sparc64-index.xml b/BOOK/sparc64-index.xml
index 4fd8c41..4a52519 100644
--- a/BOOK/sparc64-index.xml
+++ b/BOOK/sparc64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc64-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc64-chapter.xml"/>
</part>
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index 894ec06..e9a8400 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86-chapter.xml"/>
</part>
diff --git a/BOOK/x86_64-64-index.xml b/BOOK/x86_64-64-index.xml
index 47398da..3e5c341 100644
--- a/BOOK/x86_64-64-index.xml
+++ b/BOOK/x86_64-64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-64-chapter.xml"/>
</part>
diff --git a/BOOK/x86_64-index.xml b/BOOK/x86_64-index.xml
index c5c6ccc..914b0c9 100644
--- a/BOOK/x86_64-index.xml
+++ b/BOOK/x86_64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-chapter.xml"/>
</part>
-----------------------------------------------------------------------
Summary of changes:
BOOK/chroot/sparc64-64/flags.xml | 8 +-
BOOK/chroot/sparc64/flags.xml | 8 +-
BOOK/cross-tools/64/flags.xml | 23 -----
BOOK/cross-tools/mips-chapter.xml | 1 -
BOOK/cross-tools/mips64-64-chapter.xml | 2 -
BOOK/cross-tools/mips64-64/flags.xml | 27 ------
BOOK/cross-tools/mips64-chapter.xml | 2 -
BOOK/cross-tools/mips64/flags.xml | 31 -------
BOOK/cross-tools/multilib/flags.xml | 27 ------
BOOK/cross-tools/ppc-chapter.xml | 1 -
BOOK/cross-tools/ppc64-64-chapter.xml | 2 -
BOOK/cross-tools/ppc64-64/variables.xml | 37 --------
BOOK/cross-tools/ppc64-chapter.xml | 2 -
BOOK/cross-tools/sparc-chapter.xml | 1 -
BOOK/cross-tools/sparc64-64-chapter.xml | 2 -
BOOK/cross-tools/sparc64-64/flags.xml | 68 ---------------
BOOK/cross-tools/sparc64-64/variables.xml | 41 ---------
BOOK/cross-tools/sparc64-chapter.xml | 2 -
BOOK/cross-tools/x86-chapter.xml | 1 -
BOOK/cross-tools/x86_64-64-chapter.xml | 2 -
BOOK/cross-tools/x86_64-chapter.xml | 2 -
BOOK/final-preps/chapter.xml | 20 -----
BOOK/final-preps/{ => common}/aboutclfs.xml | 2 +-
BOOK/final-preps/{ => common}/abouttestsuites.xml | 2 +-
BOOK/final-preps/{ => common}/addinguser.xml | 2 +-
BOOK/final-preps/{ => common}/creatingcrossdir.xml | 2 +-
BOOK/final-preps/{ => common}/creatingtoolsdir.xml | 2 +-
BOOK/final-preps/{ => common}/settingenviron.xml | 2 +-
.../mips-chapter.xml} | 22 ++---
.../mips/variables.xml | 4 +-
.../mips64-64-chapter.xml} | 22 ++---
.../mips64-64/variables.xml | 16 +++-
BOOK/{network => final-preps}/mips64-chapter.xml | 22 ++---
.../mips64/variables.xml | 27 +++++--
BOOK/{introduction => final-preps}/ppc-chapter.xml | 24 ++---
.../{cross-tools => final-preps}/ppc/variables.xml | 4 +-
.../ppc64-64-chapter.xml} | 24 ++---
.../ppc64 => final-preps/ppc64-64}/variables.xml | 18 +++--
.../ppc64-chapter.xml} | 24 ++---
.../sparc64 => final-preps/ppc64}/variables.xml | 20 +++--
.../sparc-chapter.xml} | 24 ++---
.../sparc/variables.xml | 4 +-
.../sparc64-64-chapter.xml} | 24 ++---
BOOK/final-preps/sparc64-64/variables.xml | 90 ++++++++++++++++++++
.../sparc64-chapter.xml | 24 ++---
.../sparc64/variables.xml} | 52 +++++++++---
.../x86-chapter.xml} | 23 ++---
.../{cross-tools => final-preps}/x86/variables.xml | 0
BOOK/{chroot => final-preps}/x86_64-64-chapter.xml | 23 ++---
.../x86_64-64/variables.xml | 18 +++-
.../x86_64-chapter.xml} | 23 ++---
.../x86_64/variables.xml | 20 +++--
BOOK/introduction/common/changelog.xml | 5 +
BOOK/mips-index.xml | 2 +-
BOOK/mips64-64-index.xml | 2 +-
BOOK/mips64-index.xml | 2 +-
BOOK/ppc-index.xml | 2 +-
BOOK/ppc64-64-index.xml | 2 +-
BOOK/ppc64-index.xml | 2 +-
BOOK/sparc-index.xml | 2 +-
BOOK/sparc64-64-index.xml | 2 +-
BOOK/sparc64-index.xml | 2 +-
BOOK/x86-index.xml | 2 +-
BOOK/x86_64-64-index.xml | 2 +-
BOOK/x86_64-index.xml | 2 +-
65 files changed, 374 insertions(+), 529 deletions(-)
delete mode 100644 BOOK/cross-tools/64/flags.xml
delete mode 100644 BOOK/cross-tools/mips64-64/flags.xml
delete mode 100644 BOOK/cross-tools/mips64/flags.xml
delete mode 100644 BOOK/cross-tools/multilib/flags.xml
delete mode 100644 BOOK/cross-tools/ppc64-64/variables.xml
delete mode 100644 BOOK/cross-tools/sparc64-64/flags.xml
delete mode 100644 BOOK/cross-tools/sparc64-64/variables.xml
delete mode 100644 BOOK/final-preps/chapter.xml
rename BOOK/final-preps/{ => common}/aboutclfs.xml (96%)
rename BOOK/final-preps/{ => common}/abouttestsuites.xml (92%)
rename BOOK/final-preps/{ => common}/addinguser.xml (98%)
rename BOOK/final-preps/{ => common}/creatingcrossdir.xml (95%)
rename BOOK/final-preps/{ => common}/creatingtoolsdir.xml (97%)
rename BOOK/final-preps/{ => common}/settingenviron.xml (98%)
copy BOOK/{network/ppc64-chapter.xml => final-preps/mips-chapter.xml} (65%)
rename BOOK/{cross-tools => final-preps}/mips/variables.xml (92%)
copy BOOK/{network/x86_64-chapter.xml => final-preps/mips64-64-chapter.xml} (65%)
rename BOOK/{cross-tools => final-preps}/mips64-64/variables.xml (77%)
copy BOOK/{network => final-preps}/mips64-chapter.xml (65%)
rename BOOK/{cross-tools => final-preps}/mips64/variables.xml (72%)
copy BOOK/{introduction => final-preps}/ppc-chapter.xml (64%)
rename BOOK/{cross-tools => final-preps}/ppc/variables.xml (91%)
copy BOOK/{introduction/ppc-chapter.xml => final-preps/ppc64-64-chapter.xml} (64%)
rename BOOK/{cross-tools/ppc64 => final-preps/ppc64-64}/variables.xml (71%)
copy BOOK/{introduction/ppc-chapter.xml => final-preps/ppc64-chapter.xml} (64%)
rename BOOK/{cross-tools/sparc64 => final-preps/ppc64}/variables.xml (67%)
copy BOOK/{introduction/sparc64-chapter.xml => final-preps/sparc-chapter.xml} (64%)
rename BOOK/{cross-tools => final-preps}/sparc/variables.xml (91%)
copy BOOK/{introduction/sparc64-chapter.xml => final-preps/sparc64-64-chapter.xml} (64%)
create mode 100644 BOOK/final-preps/sparc64-64/variables.xml
copy BOOK/{introduction => final-preps}/sparc64-chapter.xml (64%)
rename BOOK/{cross-tools/sparc64/flags.xml => final-preps/sparc64/variables.xml} (55%)
copy BOOK/{chroot/x86_64-64-chapter.xml => final-preps/x86-chapter.xml} (61%)
rename BOOK/{cross-tools => final-preps}/x86/variables.xml (100%)
copy BOOK/{chroot => final-preps}/x86_64-64-chapter.xml (61%)
rename BOOK/{cross-tools => final-preps}/x86_64-64/variables.xml (74%)
copy BOOK/{chroot/x86_64-64-chapter.xml => final-preps/x86_64-chapter.xml} (61%)
rename BOOK/{cross-tools => final-preps}/x86_64/variables.xml (63%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list