-
diff --git a/BOOK/boot/common/boot-scripts.xml b/BOOK/boot/common/boot-scripts.xml
index f0bb2ae..9256e8f 100644
a
|
b
|
|
27 | 27 | |
28 | 28 | <para os="a">Install the package:</para> |
29 | 29 | |
30 | | <screen os="b"><userinput>make DESTDIR=/tools install-boot-scripts</userinput></screen> |
| 30 | <screen os="b"><userinput>make DESTDIR=${CLFS}/tools install-boot-scripts</userinput></screen> |
31 | 31 | |
32 | 32 | <para os="c">The <command>setclock</command> script reads the time from the |
33 | 33 | hardware clock, also known as the BIOS or the Complementary Metal Oxide |
… |
… |
|
51 | 51 | to a value of <option>0</option> (zero) if the hardware clock |
52 | 52 | is <emphasis>not</emphasis> set to UTC time.</para> |
53 | 53 | |
54 | | <screen os="f"><userinput>cat > /tools/etc/sysconfig/clock << "EOF" |
| 54 | <screen os="f"><userinput>cat > ${CLFS}/tools/etc/sysconfig/clock << "EOF" |
55 | 55 | <literal># Begin /tools/etc/sysconfig/clock |
56 | 56 | |
57 | 57 | UTC=1 |
-
diff --git a/BOOK/boot/common/e2fsprogs.xml b/BOOK/boot/common/e2fsprogs.xml
index 4d4bdd5..ce7dccb 100644
a
|
b
|
|
64 | 64 | href="../../final-system/common/e2fsprogs.xml" |
65 | 65 | xpointer="xpointer(//*[@os='i'])"/> |
66 | 66 | |
67 | | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
68 | | href="../../final-system/common/e2fsprogs.xml" |
69 | | xpointer="xpointer(//*[@os='j'])"/> |
| 67 | <screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
70 | 68 | |
71 | 69 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
72 | 70 | href="../../final-system/common/e2fsprogs.xml" |
73 | 71 | xpointer="xpointer(//*[@os='k'])"/> |
74 | 72 | |
75 | | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
76 | | href="../../final-system/common/e2fsprogs.xml" |
77 | | xpointer="xpointer(//*[@os='l'])"/> |
| 73 | <screen os="l"><userinput>make DESTDIR=${CLFS} install-libs</userinput></screen> |
78 | 74 | |
79 | 75 | </sect2> |
80 | 76 | |
-
diff --git a/BOOK/boot/common/eudev.xml b/BOOK/boot/common/eudev.xml
index 132ffc7..952d3a8 100644
a
|
b
|
|
40 | 40 | |
41 | 41 | <para os="g">Install the package:</para> |
42 | 42 | |
43 | | <screen os="j"><userinput>make install</userinput></screen> |
| 43 | <screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
44 | 44 | |
45 | 45 | <para os="i">Create a directory for storing firmware that can be |
46 | 46 | loaded by <command>udev</command>:</para> |
47 | 47 | |
48 | | <screen os="k"><userinput>install -dv /tools/lib/firmware</userinput></screen> |
| 48 | <screen os="k"><userinput>install -dv ${CLFS}/tools/lib/firmware</userinput></screen> |
49 | 49 | |
50 | 50 | <para os="r1">Create a dummy rule so that Eudev will name ethernet devices properly for the system.</para> |
51 | 51 | |
52 | 52 | <screen os="r2"><userinput>echo "# dummy, so that network is once again on eth*" \ |
53 | | > /tools/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen> |
| 53 | > ${CLFS}/tools/etc/udev/rules.d/80-net-name-slot.rules</userinput></screen> |
54 | 54 | |
55 | 55 | </sect2> |
56 | 56 | |
-
diff --git a/BOOK/boot/common/kmod.xml b/BOOK/boot/common/kmod.xml
index 283c8f6..b82f67c 100644
a
|
b
|
sed '/dirname_default_prefix /s@/lib/modules@/tools&@' \ |
63 | 63 | href="../../final-system/common/kmod.xml" |
64 | 64 | xpointer="xpointer(//*[@os='g'])"/> |
65 | 65 | |
66 | | <screen os="h"><userinput>make install</userinput></screen> |
| 66 | <screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
67 | 67 | |
68 | 68 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
69 | 69 | href="../../final-system/common/kmod.xml" |
70 | 70 | xpointer="xpointer(//*[@os='i'])"/> |
71 | 71 | |
72 | | <screen os="j"><userinput>ln -sfv kmod /tools/bin/lsmod |
| 72 | <screen os="j"><userinput>ln -sfv kmod ${CLFS}/tools/bin/lsmod |
73 | 73 | for tool in depmod insmod modprobe modinfo rmmod; do |
74 | | ln -sv ../bin/kmod /tools/sbin/${tool} |
| 74 | ln -sv ../bin/kmod ${CLFS}/tools/sbin/${tool} |
75 | 75 | done</userinput></screen> |
76 | 76 | |
77 | 77 | </sect2> |
-
diff --git a/BOOK/boot/common/shadow.xml b/BOOK/boot/common/shadow.xml
index 2add343..1b2aa0c 100644
a
|
b
|
sed 's/\(^suidu*bins = \).*/\1/' src/Makefile.orig > src/Makefile</userinput> |
52 | 52 | |
53 | 53 | <para os="l">Install the package:</para> |
54 | 54 | |
55 | | <screen os="m"><userinput>make install</userinput></screen> |
| 55 | <screen os="m"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
56 | 56 | |
57 | 57 | </sect2> |
58 | 58 | |
-
diff --git a/BOOK/boot/common/sysvinit.xml b/BOOK/boot/common/sysvinit.xml
index eff26c7..7a3a576 100644
a
|
b
|
make -C src CC="${CC}"</userinput></screen> |
38 | 38 | |
39 | 39 | <para os="e">Install the package:</para> |
40 | 40 | |
41 | | <screen os="ad"><userinput>make -C src ROOT=/tools install</userinput></screen> |
| 41 | <screen os="ad"><userinput>make -C src ROOT=${CLFS}/tools install</userinput></screen> |
42 | 42 | |
43 | 43 | </sect2> |
44 | 44 | |
… |
… |
make -C src CC="${CC}"</userinput></screen> |
57 | 57 | <para>Create a new file <filename>/tools/etc/inittab</filename> by running the |
58 | 58 | following:</para> |
59 | 59 | |
60 | | <screen><userinput>cat > /tools/etc/inittab << "EOF" |
| 60 | <screen><userinput>cat > ${CLFS}/tools/etc/inittab << "EOF" |
61 | 61 | <literal># Begin /tools/etc/inittab |
62 | 62 | |
63 | 63 | id:3:initdefault: |
… |
… |
EOF</userinput></screen> |
82 | 82 | <filename>/tools/etc/inittab</filename>. If your system only has a serial |
83 | 83 | console skip the following command:</para> |
84 | 84 | |
85 | | <screen><userinput>cat >> /tools/etc/inittab << "EOF" |
| 85 | <screen><userinput>cat >> ${CLFS}/tools/etc/inittab << "EOF" |
86 | 86 | <literal>1:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty1 9600 |
87 | 87 | 2:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty2 9600 |
88 | 88 | 3:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty3 9600 |
… |
… |
EOF</userinput></screen> |
95 | 95 | <para>If your system has a serial console, run the following command to add |
96 | 96 | the entry to <filename>/tools/etc/inittab</filename>.</para> |
97 | 97 | |
98 | | <screen><userinput>cat >> /tools/etc/inittab << "EOF" |
| 98 | <screen><userinput>cat >> ${CLFS}/tools/etc/inittab << "EOF" |
99 | 99 | <literal>c0:12345:respawn:/tools/sbin/agetty --noclear 115200 ttyS0 vt100 |
100 | 100 | </literal> |
101 | 101 | EOF</userinput></screen> |
102 | 102 | |
103 | 103 | <para>Finally, add the end line to <filename>/tools/etc/inittab</filename>.</para> |
104 | 104 | |
105 | | <screen><userinput>cat >> /tools/etc/inittab << "EOF" |
| 105 | <screen><userinput>cat >> ${CLFS}/tools/etc/inittab << "EOF" |
106 | 106 | <literal># End /tools/etc/inittab</literal> |
107 | 107 | EOF</userinput></screen> |
108 | 108 | |
-
diff --git a/BOOK/boot/mips/colo-build.xml b/BOOK/boot/mips/colo-build.xml
index 93fd18b..b8f951f 100644
a
|
b
|
make CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen> |
54 | 54 | href="../../final-system/mips/colo.xml" |
55 | 55 | xpointer="xpointer(//*[@os='c'])"/> |
56 | 56 | |
57 | | <screen os="ab"><userinput>cp -v chain/colo-chain.elf /tools/boot/vmlinux |
58 | | gzip -9 /tools/boot/vmlinux</userinput></screen> |
| 57 | <screen os="ab"><userinput>cp -v chain/colo-chain.elf ${CLFS}/tools/boot/vmlinux |
| 58 | gzip -9 ${CLFS}/tools/boot/vmlinux</userinput></screen> |
59 | 59 | |
60 | 60 | </sect2> |
61 | 61 | |
-
diff --git a/BOOK/boot/mips/kernel.xml b/BOOK/boot/mips/kernel.xml
index dcf0f36..ac2425f 100644
a
|
b
|
|
71 | 71 | xpointer="xpointer(//*[@os='s'])"/> |
72 | 72 | |
73 | 73 | <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \ |
74 | | INSTALL_MOD_PATH=/tools modules_install</userinput></screen> |
| 74 | INSTALL_MOD_PATH=${CLFS}/tools modules_install</userinput></screen> |
75 | 75 | |
76 | 76 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
77 | 77 | href="../../bootable/x86/kernel.xml" |
78 | 78 | xpointer="xpointer(//*[@os='s2'])"/> |
79 | 79 | |
80 | 80 | <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \ |
81 | | INSTALL_MOD_PATH=/tools firmware_install</userinput></screen> |
| 81 | INSTALL_MOD_PATH=${CLFS}/tools firmware_install</userinput></screen> |
82 | 82 | |
83 | 83 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
84 | 84 | href="../x86/kernel.xml" |
… |
… |
|
88 | 88 | href="../x86/kernel.xml" |
89 | 89 | xpointer="xpointer(//*[@os='v'])"/> |
90 | 90 | |
91 | | <screen><userinput>mkdir -pv /tools/boot |
92 | | cp -v vmlinux /tools/boot/vmlinux-&linux-version; |
93 | | gzip -9 /tools/boot/vmlinux-&linux-version;</userinput></screen> |
| 91 | <screen><userinput>mkdir -pv ${CLFS}/tools/boot |
| 92 | cp -v vmlinux ${CLFS}/tools/boot/vmlinux-&linux-version; |
| 93 | gzip -9 ${CLFS}/tools/boot/vmlinux-&linux-version;</userinput></screen> |
94 | 94 | |
95 | 95 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
96 | 96 | href="../x86/kernel.xml" |
-
diff --git a/BOOK/boot/mips64/kernel.xml b/BOOK/boot/mips64/kernel.xml
index fea3b01..5b33427 100644
a
|
b
|
|
75 | 75 | xpointer="xpointer(//*[@os='s'])"/> |
76 | 76 | |
77 | 77 | <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \ |
78 | | INSTALL_MOD_PATH=/tools modules_install</userinput></screen> |
| 78 | INSTALL_MOD_PATH=${CLFS}/tools modules_install</userinput></screen> |
79 | 79 | |
80 | 80 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
81 | 81 | href="../../bootable/x86/kernel.xml" |
82 | 82 | xpointer="xpointer(//*[@os='s2'])"/> |
83 | 83 | |
84 | 84 | <screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \ |
85 | | INSTALL_MOD_PATH=/tools firmware_install</userinput></screen> |
| 85 | INSTALL_MOD_PATH=${CLFS}/tools firmware_install</userinput></screen> |
86 | 86 | |
87 | 87 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
88 | 88 | href="../x86/kernel.xml" |
… |
… |
|
92 | 92 | href="../x86/kernel.xml" |
93 | 93 | xpointer="xpointer(//*[@os='v'])"/> |
94 | 94 | |
95 | | <screen><userinput>mkdir -pv /tools/boot |
96 | | cp -v vmlinux /tools/boot/vmlinux-&linux-version; |
97 | | gzip -9 /tools/boot/vmlinux-&linux-version;</userinput></screen> |
| 95 | <screen><userinput>mkdir -pv ${CLFS}/tools/boot |
| 96 | cp -v vmlinux ${CLFS}/tools/boot/vmlinux-&linux-version; |
| 97 | gzip -9 ${CLFS}/tools/boot/vmlinux-&linux-version;</userinput></screen> |
98 | 98 | |
99 | 99 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
100 | 100 | href="../x86/kernel.xml" |
-
diff --git a/BOOK/boot/ppc/kernel.xml b/BOOK/boot/ppc/kernel.xml
index bd6eee9..53938a5 100644
a
|
b
|
|
76 | 76 | xpointer="xpointer(//*[@os='s'])"/> |
77 | 77 | |
78 | 78 | <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \ |
79 | | INSTALL_MOD_PATH=/tools modules_install</userinput></screen> |
| 79 | INSTALL_MOD_PATH=${CLFS}/tools modules_install</userinput></screen> |
80 | 80 | |
81 | 81 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
82 | 82 | href="../../bootable/x86/kernel.xml" |
83 | 83 | xpointer="xpointer(//*[@os='s2'])"/> |
84 | 84 | |
85 | 85 | <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \ |
86 | | INSTALL_MOD_PATH=/tools firmware_install</userinput></screen> |
| 86 | INSTALL_MOD_PATH=${CLFS}/tools firmware_install</userinput></screen> |
87 | 87 | |
88 | 88 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
89 | 89 | href="../x86/kernel.xml" |
… |
… |
|
93 | 93 | href="../x86/kernel.xml" |
94 | 94 | xpointer="xpointer(//*[@os='v'])"/> |
95 | 95 | |
96 | | <screen><userinput>mkdir -pv /tools/boot |
97 | | cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen> |
| 96 | <screen><userinput>mkdir -pv ${CLFS}/tools/boot |
| 97 | cp -v vmlinux ${CLFS}/tools/boot/clfskernel-&linux-version;</userinput></screen> |
98 | 98 | |
99 | 99 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
100 | 100 | href="../x86/kernel.xml" |
-
diff --git a/BOOK/boot/ppc64/e2fsprogs.xml b/BOOK/boot/ppc64/e2fsprogs.xml
index f05597e..4ee7bb4 100644
a
|
b
|
make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" LIBBLKID="-lblkid" \ |
74 | 74 | |
75 | 75 | <para os="i">Install the e2fsck binary:</para> |
76 | 76 | |
77 | | <screen os="j"><userinput>make install -C e2fsck</userinput></screen> |
| 77 | <screen os="j"><userinput>make DESTDIR=${CLFS} install -C e2fsck</userinput></screen> |
78 | 78 | |
79 | 79 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
80 | 80 | href="../common/e2fsprogs.xml" |
-
diff --git a/BOOK/boot/ppc64/kernel.xml b/BOOK/boot/ppc64/kernel.xml
index eb5e4bc..e632ed7 100644
a
|
b
|
|
75 | 75 | xpointer="xpointer(//*[@os='s'])"/> |
76 | 76 | |
77 | 77 | <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \ |
78 | | INSTALL_MOD_PATH=/tools modules_install</userinput></screen> |
| 78 | INSTALL_MOD_PATH=${CLFS}/tools modules_install</userinput></screen> |
79 | 79 | |
80 | 80 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
81 | 81 | href="../../bootable/x86/kernel.xml" |
82 | 82 | xpointer="xpointer(//*[@os='s2'])"/> |
83 | 83 | |
84 | 84 | <screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \ |
85 | | INSTALL_MOD_PATH=/tools firmware_install</userinput></screen> |
| 85 | INSTALL_MOD_PATH=${CLFS}/tools firmware_install</userinput></screen> |
86 | 86 | |
87 | 87 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
88 | 88 | href="../x86/kernel.xml" |
… |
… |
|
92 | 92 | href="../x86/kernel.xml" |
93 | 93 | xpointer="xpointer(//*[@os='v'])"/> |
94 | 94 | |
95 | | <screen><userinput>mkdir -pv /tools/boot |
96 | | cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen> |
| 95 | <screen><userinput>mkdir -pv ${CLFS}/tools/boot |
| 96 | cp -v vmlinux ${CLFS}/tools/boot/clfskernel-&linux-version;</userinput></screen> |
97 | 97 | |
98 | 98 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
99 | 99 | href="../x86/kernel.xml" |
-
diff --git a/BOOK/boot/sparc/elftoaout.xml b/BOOK/boot/sparc/elftoaout.xml
index 20cfe37..472eb01 100644
a
|
b
|
|
36 | 36 | |
37 | 37 | <para>Install the package:</para> |
38 | 38 | |
39 | | <screen><userinput>install -v -m 0755 -s elftoaout /cross-tools/bin</userinput></screen> |
| 39 | <screen><userinput>install -v -m 0755 -s elftoaout ${CLFS}/cross-tools/bin</userinput></screen> |
40 | 40 | |
41 | 41 | </sect2> |
42 | 42 | |
-
diff --git a/BOOK/boot/sparc/kernel.xml b/BOOK/boot/sparc/kernel.xml
index 588f51a..1580b1b 100644
a
|
b
|
|
71 | 71 | xpointer="xpointer(//*[@os='s'])"/> |
72 | 72 | |
73 | 73 | <screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \ |
74 | | INSTALL_MOD_PATH=/tools modules_install</userinput></screen> |
| 74 | INSTALL_MOD_PATH=${CLFS}/tools modules_install</userinput></screen> |
75 | 75 | |
76 | 76 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
77 | 77 | href="../../bootable/x86/kernel.xml" |
78 | 78 | xpointer="xpointer(//*[@os='s2'])"/> |
79 | 79 | |
80 | 80 | <screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \ |
81 | | INSTALL_MOD_PATH=/tools firmware_install</userinput></screen> |
| 81 | INSTALL_MOD_PATH=${CLFS}/tools firmware_install</userinput></screen> |
82 | 82 | |
83 | 83 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
84 | 84 | href="../x86/kernel.xml" |
… |
… |
|
88 | 88 | href="../x86/kernel.xml" |
89 | 89 | xpointer="xpointer(//*[@os='v'])"/> |
90 | 90 | |
91 | | <screen><userinput>mkdir -pv /tools/boot |
92 | | cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen> |
| 91 | <screen><userinput>mkdir -pv ${CLFS}/tools/boot |
| 92 | cp -v vmlinux ${CLFS}/tools/boot/clfskernel-&linux-version;</userinput></screen> |
93 | 93 | |
94 | 94 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
95 | 95 | href="../x86/kernel.xml" |
-
diff --git a/BOOK/boot/sparc64/kernel.xml b/BOOK/boot/sparc64/kernel.xml
index a6de7d5..cd035e2 100644
a
|
b
|
|
72 | 72 | href="../x86/kernel.xml" |
73 | 73 | xpointer="xpointer(//*[@os='s'])"/> |
74 | 74 | |
75 | | <screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=/tools \ |
| 75 | <screen><userinput>make ARCH=sparc64 INSTALL_MOD_PATH=${CLFS}/tools \ |
76 | 76 | CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen> |
77 | 77 | |
78 | 78 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
… |
… |
|
80 | 80 | xpointer="xpointer(//*[@os='s2'])"/> |
81 | 81 | |
82 | 82 | <screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- \ |
83 | | INSTALL_MOD_PATH=/tools firmware_install</userinput></screen> |
| 83 | INSTALL_MOD_PATH=${CLFS}/tools firmware_install</userinput></screen> |
84 | 84 | |
85 | 85 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
86 | 86 | href="../x86/kernel.xml" |
… |
… |
|
90 | 90 | href="../x86/kernel.xml" |
91 | 91 | xpointer="xpointer(//*[@os='v'])"/> |
92 | 92 | |
93 | | <screen><userinput>mkdir -pv /tools/boot |
94 | | cp -v vmlinux /tools/boot/clfskernel-&linux-version;</userinput></screen> |
| 93 | <screen><userinput>mkdir -pv ${CLFS}/tools/boot |
| 94 | cp -v vmlinux ${CLFS}/tools/boot/clfskernel-&linux-version;</userinput></screen> |
95 | 95 | |
96 | 96 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
97 | 97 | href="../x86/kernel.xml" |
-
diff --git a/BOOK/boot/x86/kernel.xml b/BOOK/boot/x86/kernel.xml
index c8328f0..bf0fa13 100644
a
|
b
|
|
79 | 79 | xpointer="xpointer(//*[@os='s'])"/> |
80 | 80 | |
81 | 81 | <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \ |
82 | | INSTALL_MOD_PATH=/tools modules_install</userinput></screen> |
| 82 | INSTALL_MOD_PATH=${CLFS}/tools modules_install</userinput></screen> |
83 | 83 | |
84 | 84 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
85 | 85 | href="../../bootable/x86/kernel.xml" |
86 | 86 | xpointer="xpointer(//*[@os='s2'])"/> |
87 | 87 | |
88 | 88 | <screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \ |
89 | | INSTALL_MOD_PATH=/tools firmware_install</userinput></screen> |
| 89 | INSTALL_MOD_PATH=${CLFS}/tools firmware_install</userinput></screen> |
90 | 90 | |
91 | 91 | <para os="u">After kernel compilation is complete, additional steps are |
92 | 92 | required to complete the installation. Some files need to be copied to |
… |
… |
|
94 | 94 | |
95 | 95 | <para os="v">Issue the following commands to install the kernel:</para> |
96 | 96 | |
97 | | <screen><userinput>mkdir -pv /tools/boot |
98 | | cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;</userinput></screen> |
| 97 | <screen><userinput>mkdir -pv ${CLFS}/tools/boot |
| 98 | cp -v arch/i386/boot/bzImage ${CLFS}/tools/boot/vmlinuz-clfs-&linux-version;</userinput></screen> |
99 | 99 | |
100 | 100 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
101 | 101 | href="../../bootable/x86/kernel.xml" |
102 | 102 | xpointer="xpointer(//*[@os='w'])"/> |
103 | 103 | |
104 | | <screen os="w1"><userinput>cp -v System.map /tools/boot/System.map-&linux-version;</userinput></screen> |
| 104 | <screen os="w1"><userinput>cp -v System.map ${CLFS}/tools/boot/System.map-&linux-version;</userinput></screen> |
105 | 105 | |
106 | 106 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
107 | 107 | href="../../bootable/x86/kernel.xml" |
108 | 108 | xpointer="xpointer(//*[@os='x'])"/> |
109 | 109 | |
110 | | <screen os="x1"><userinput>cp -v .config /tools/boot/config-&linux-version;</userinput></screen> |
| 110 | <screen os="x1"><userinput>cp -v .config ${CLFS}/tools/boot/config-&linux-version;</userinput></screen> |
111 | 111 | |
112 | 112 | </sect2> |
113 | 113 | |
-
diff --git a/BOOK/boot/x86_64/kernel.xml b/BOOK/boot/x86_64/kernel.xml
index 067c126..5693af7 100644
a
|
b
|
|
75 | 75 | xpointer="xpointer(//*[@os='s'])"/> |
76 | 76 | |
77 | 77 | <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \ |
78 | | INSTALL_MOD_PATH=/tools modules_install</userinput></screen> |
| 78 | INSTALL_MOD_PATH=${CLFS}/tools modules_install</userinput></screen> |
79 | 79 | |
80 | 80 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
81 | 81 | href="../../bootable/x86/kernel.xml" |
82 | 82 | xpointer="xpointer(//*[@os='s2'])"/> |
83 | 83 | |
84 | 84 | <screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \ |
85 | | INSTALL_MOD_PATH=/tools firmware_install</userinput></screen> |
| 85 | INSTALL_MOD_PATH=${CLFS}/tools firmware_install</userinput></screen> |
86 | 86 | |
87 | 87 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
88 | 88 | href="../x86/kernel.xml" |
… |
… |
|
92 | 92 | href="../x86/kernel.xml" |
93 | 93 | xpointer="xpointer(//*[@os='v'])"/> |
94 | 94 | |
95 | | <screen><userinput>mkdir -pv /tools/boot |
96 | | cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version;</userinput></screen> |
| 95 | <screen><userinput>mkdir -pv ${CLFS}/tools/boot |
| 96 | cp -v arch/x86_64/boot/bzImage ${CLFS}/tools/boot/vmlinuz-clfs-&linux-version;</userinput></screen> |
97 | 97 | |
98 | 98 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
99 | 99 | href="../x86/kernel.xml" |
-
diff --git a/BOOK/cross-tools/64/glibc.xml b/BOOK/cross-tools/64/glibc.xml
index 49db731..4895ac1 100644
a
|
b
|
|
59 | 59 | ../glibc-&glibc-version;/configure --prefix=/tools \ |
60 | 60 | --host=${CLFS_TARGET} --build=${CLFS_HOST} \ |
61 | 61 | --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \ |
62 | | --with-binutils=/cross-tools/bin --with-headers=/tools/include \ |
| 62 | --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/tools/include \ |
63 | 63 | --enable-obsolete-rpc --cache-file=config.cache</userinput></screen> |
64 | 64 | |
65 | 65 | <variablelist os="dg"> |
-
diff --git a/BOOK/cross-tools/common/bc.xml b/BOOK/cross-tools/common/bc.xml
index c957f35..640a497 100644
a
|
b
|
|
24 | 24 | |
25 | 25 | <para>Prepare Bc for compilation:</para> |
26 | 26 | |
27 | | <screen><userinput>./configure --prefix=/cross-tools</userinput></screen> |
| 27 | <screen><userinput>./configure --prefix=${CLFS}/cross-tools</userinput></screen> |
28 | 28 | |
29 | 29 | <variablelist> |
30 | 30 | <title>The meaning of the configure option:</title> |
31 | 31 | |
32 | 32 | <varlistentry> |
33 | | <term><parameter>--prefix=/cross-tools</parameter></term> |
| 33 | <term><parameter>--prefix=${CLFS}/cross-tools</parameter></term> |
34 | 34 | <listitem> |
35 | 35 | <para>This tells the configure script to prepare to install the |
36 | | package in the <filename class="directory">/cross-tools</filename> |
| 36 | package in the <filename class="directory">${CLFS}/cross-tools</filename> |
37 | 37 | directory.</para> |
38 | 38 | </listitem> |
39 | 39 | </varlistentry> |
-
diff --git a/BOOK/cross-tools/common/binutils-32.xml b/BOOK/cross-tools/common/binutils-32.xml
index 1455c8f..fde95e5 100644
a
|
b
|
|
49 | 49 | xpointer="xpointer(//*[@os='i'])"/> |
50 | 50 | |
51 | 51 | <screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-dir;/configure \ |
52 | | --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ |
| 52 | --prefix=${CLFS}/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ |
53 | 53 | --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \ |
54 | 54 | --disable-static --disable-multilib</userinput></screen> |
55 | 55 | |
-
diff --git a/BOOK/cross-tools/common/binutils.xml b/BOOK/cross-tools/common/binutils.xml
index d9e62af..82c71de 100644
a
|
b
|
|
49 | 49 | xpointer="xpointer(//*[@os='i'])"/> |
50 | 50 | |
51 | 51 | <screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-dir;/configure \ |
52 | | --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ |
| 52 | --prefix=${CLFS}/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ |
53 | 53 | --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \ |
54 | 54 | --disable-static --enable-64-bit-bfd --disable-multilib</userinput></screen> |
55 | 55 | |
-
diff --git a/BOOK/cross-tools/common/cloog.xml b/BOOK/cross-tools/common/cloog.xml
index 75810c0..3552c43 100644
a
|
b
|
|
24 | 24 | |
25 | 25 | <para os="a">Prepare CLooG for compilation:</para> |
26 | 26 | |
27 | | <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ |
28 | | ./configure --prefix=/cross-tools --disable-static \ |
29 | | --with-gmp-prefix=/cross-tools --with-isl-prefix=/cross-tools</userinput></screen> |
| 27 | <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ |
| 28 | ./configure --prefix=${CLFS}/cross-tools --disable-static \ |
| 29 | --with-gmp-prefix=${CLFS}/cross-tools --with-isl-prefix=${CLFS}/cross-tools</userinput></screen> |
30 | 30 | |
31 | 31 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
32 | 32 | href="../../final-system/common/cloog.xml" |
-
diff --git a/BOOK/cross-tools/common/file.xml b/BOOK/cross-tools/common/file.xml
index b3cae0d..631560a 100644
a
|
b
|
|
24 | 24 | |
25 | 25 | <para>Prepare File for compilation:</para> |
26 | 26 | |
27 | | <screen><userinput>./configure --prefix=/cross-tools --disable-static</userinput></screen> |
| 27 | <screen><userinput>./configure --prefix=${CLFS}/cross-tools --disable-static</userinput></screen> |
28 | 28 | |
29 | 29 | <variablelist> |
30 | 30 | <title>The meaning of the new configure option:</title> |
-
diff --git a/BOOK/cross-tools/common/gcc-final.xml b/BOOK/cross-tools/common/gcc-final.xml
index 2acd30f..3e03d63 100644
a
|
b
|
|
58 | 58 | href="gcc-static.xml" |
59 | 59 | xpointer="xpointer(//*[@os='h'])"/> |
60 | 60 | |
61 | | <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ |
62 | | ../gcc-&gcc-version;/configure --prefix=/cross-tools \ |
| 61 | <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ |
| 62 | ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \ |
63 | 63 | --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \ |
64 | 64 | --with-sysroot=${CLFS} --with-local-prefix=/tools \ |
65 | 65 | --with-native-system-header-dir=/tools/include --disable-nls \ |
66 | 66 | --enable-shared --disable-static --enable-languages=c,c++ \ |
67 | 67 | --enable-__cxa_atexit --enable-c99 \ |
68 | 68 | --enable-long-long --enable-threads=posix --disable-multilib \ |
69 | | --with-mpc=/cross-tools --with-mpfr=/cross-tools --with-gmp=/cross-tools \ |
70 | | --with-cloog=/cross-tools --with-isl=/cross-tools --with-system-zlib \ |
| 69 | --with-mpc=${CLFS}/cross-tools --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \ |
| 70 | --with-cloog=${CLFS}/cross-tools --with-isl=${CLFS}/cross-tools --with-system-zlib \ |
71 | 71 | --enable-checking=release --enable-libstdcxx-time</userinput></screen> |
72 | 72 | |
73 | 73 | <variablelist os="bg"> |
-
diff --git a/BOOK/cross-tools/common/gcc-static.xml b/BOOK/cross-tools/common/gcc-static.xml
index dd81822..e1d2e9a 100644
a
|
b
|
echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFI |
46 | 46 | <para os="t1">We will create a dummy <filename>limits.h</filename> so |
47 | 47 | the build will not use the one provided by the host distro:</para> |
48 | 48 | |
49 | | <screen os="t2"><userinput>touch /tools/include/limits.h</userinput></screen> |
| 49 | <screen os="t2"><userinput>touch ${CLFS}/tools/include/limits.h</userinput></screen> |
50 | 50 | |
51 | 51 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
52 | 52 | href="../../final-system/common/gcc.xml" |
… |
… |
echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFI |
60 | 60 | href="../../final-system/common/gcc.xml" |
61 | 61 | xpointer="xpointer(//*[@os='h'])"/> |
62 | 62 | |
63 | | <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ |
64 | | ../gcc-&gcc-version;/configure --prefix=/cross-tools \ |
| 63 | <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ |
| 64 | ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \ |
65 | 65 | --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \ |
66 | 66 | --with-sysroot=${CLFS} --with-local-prefix=/tools \ |
67 | 67 | --with-native-system-header-dir=/tools/include --disable-nls \ |
68 | | --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \ |
69 | | --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \ |
| 68 | --disable-shared --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \ |
| 69 | --with-isl=${CLFS}/cross-tools --with-cloog=${CLFS}/cross-tools --with-mpc=${CLFS}/cross-tools \ |
70 | 70 | --without-headers --with-newlib --disable-decimal-float --disable-libgomp \ |
71 | 71 | --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \ |
72 | 72 | --disable-libsanitizer --disable-libquadmath --disable-threads \ |
… |
… |
echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFI |
197 | 197 | <para os="as">Copy <filename class="headerfile">libiberty.h</filename> to |
198 | 198 | <filename class="directory">/tools/include</filename> directory:</para> |
199 | 199 | |
200 | | <screen os="at"><userinput>cp -v ../gcc-&gcc-version;/include/libiberty.h /tools/include</userinput></screen> |
| 200 | <screen os="at"><userinput>cp -v ../gcc-&gcc-version;/include/libiberty.h ${CLFS}/tools/include</userinput></screen> |
201 | 201 | |
202 | 202 | </sect2> |
203 | 203 | |
-
diff --git a/BOOK/cross-tools/common/glibc.xml b/BOOK/cross-tools/common/glibc.xml
index d25feda..dad2ecc 100644
a
|
b
|
sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile</userinpu |
55 | 55 | ../glibc-&glibc-version;/configure --prefix=/tools \ |
56 | 56 | --host=${CLFS_TARGET} --build=${CLFS_HOST} \ |
57 | 57 | --disable-profile --with-tls --enable-kernel=2.6.32 \ |
58 | | --with-__thread --with-binutils=/cross-tools/bin \ |
59 | | --with-headers=/tools/include --enable-obsolete-rpc \ |
| 58 | --with-__thread --with-binutils=${CLFS}/cross-tools/bin \ |
| 59 | --with-headers=${CLFS}/tools/include --enable-obsolete-rpc \ |
60 | 60 | --cache-file=config.cache</userinput></screen> |
61 | 61 | |
62 | 62 | <variablelist os="dg"> |
… |
… |
sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile</userinpu |
126 | 126 | </varlistentry> |
127 | 127 | |
128 | 128 | <varlistentry os="dg9"> |
129 | | <term><parameter>--with-binutils=/cross-tools/bin</parameter></term> |
| 129 | <term><parameter>--with-binutils=${CLFS}/cross-tools/bin</parameter></term> |
130 | 130 | <listitem> |
131 | 131 | <para>This tells Glibc to use the Binutils that are specific to |
132 | 132 | our target architecture.</para> |
… |
… |
sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile</userinpu |
134 | 134 | </varlistentry> |
135 | 135 | |
136 | 136 | <varlistentry os="dg10"> |
137 | | <term><parameter>--with-headers=/tools/include</parameter></term> |
| 137 | <term><parameter>--with-headers=${CLFS}/tools/include</parameter></term> |
138 | 138 | <listitem> |
139 | 139 | <para>This tells Glibc to compile itself against the headers |
140 | 140 | recently installed to the <filename class="directory">/tools</filename> |
… |
… |
sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile</userinpu |
178 | 178 | |
179 | 179 | <para os="dm">Install the package:</para> |
180 | 180 | |
181 | | <screen os="dn"><userinput>make install</userinput></screen> |
| 181 | <screen os="dn"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
182 | 182 | |
183 | 183 | </sect2> |
184 | 184 | |
-
diff --git a/BOOK/cross-tools/common/gmp.xml b/BOOK/cross-tools/common/gmp.xml
index 7770774..be11bea 100644
a
|
b
|
|
41 | 41 | |
42 | 42 | <para os="a">Prepare GMP for compilation:</para> |
43 | 43 | |
44 | | <screen os="b"><userinput>./configure --prefix=/cross-tools --enable-cxx \ |
| 44 | <screen os="b"><userinput>./configure --prefix=${CLFS}/cross-tools --enable-cxx \ |
45 | 45 | --disable-static</userinput></screen> |
46 | 46 | |
47 | 47 | <variablelist os="b1"> |
-
diff --git a/BOOK/cross-tools/common/isl.xml b/BOOK/cross-tools/common/isl.xml
index 509695b..8f592c3 100644
a
|
b
|
|
24 | 24 | |
25 | 25 | <para os="a">Prepare ISL for compilation:</para> |
26 | 26 | |
27 | | <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ |
28 | | ./configure --prefix=/cross-tools --disable-static \ |
29 | | --with-gmp-prefix=/cross-tools</userinput></screen> |
| 27 | <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ |
| 28 | ./configure --prefix=${CLFS}/cross-tools --disable-static \ |
| 29 | --with-gmp-prefix=${CLFS}/cross-tools</userinput></screen> |
30 | 30 | |
31 | 31 | <para os="c">Compile the package:</para> |
32 | 32 | |
-
diff --git a/BOOK/cross-tools/common/m4.xml b/BOOK/cross-tools/common/m4.xml
index f8d87d5..a1ae858 100644
a
|
b
|
|
24 | 24 | |
25 | 25 | <para os="a">Prepare M4 for compilation:</para> |
26 | 26 | |
27 | | <screen os="b"><userinput>./configure --prefix=/cross-tools</userinput></screen> |
| 27 | <screen os="b"><userinput>./configure --prefix=${CLFS}/cross-tools</userinput></screen> |
28 | 28 | |
29 | 29 | <para os="c">Compile the package:</para> |
30 | 30 | |
-
diff --git a/BOOK/cross-tools/common/mpc.xml b/BOOK/cross-tools/common/mpc.xml
index 4e632c1..bb3319a 100644
a
|
b
|
|
24 | 24 | |
25 | 25 | <para os="a">Prepare MPC for compilation:</para> |
26 | 26 | |
27 | | <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ |
28 | | ./configure --prefix=/cross-tools --disable-static \ |
29 | | --with-gmp=/cross-tools --with-mpfr=/cross-tools</userinput></screen> |
| 27 | <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ |
| 28 | ./configure --prefix=${CLFS}/cross-tools --disable-static \ |
| 29 | --with-gmp=${CLFS}/cross-tools --with-mpfr=${CLFS}/cross-tools</userinput></screen> |
30 | 30 | |
31 | 31 | <para os="c">Compile the package:</para> |
32 | 32 | |
-
diff --git a/BOOK/cross-tools/common/mpfr.xml b/BOOK/cross-tools/common/mpfr.xml
index 21f7115..5448ef5 100644
a
|
b
|
|
32 | 32 | |
33 | 33 | <para os="a">Prepare MPFR for compilation:</para> |
34 | 34 | |
35 | | <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ |
36 | | ./configure --prefix=/cross-tools \ |
37 | | --disable-static --with-gmp=/cross-tools</userinput></screen> |
| 35 | <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ |
| 36 | ./configure --prefix=${CLFS}/cross-tools \ |
| 37 | --disable-static --with-gmp=${CLFS}/cross-tools</userinput></screen> |
38 | 38 | |
39 | 39 | <variablelist os="b1"> |
40 | 40 | <title>The meaning of the new configure options:</title> |
41 | 41 | |
42 | 42 | <varlistentry> |
43 | | <term><parameter>LDFLAGS="-Wl,-rpath,/cross-tools/lib"</parameter></term> |
| 43 | <term><parameter>LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib"</parameter></term> |
44 | 44 | <listitem> |
45 | 45 | <para>This tells <command>configure</command> to search in |
46 | | <filename class="directory">/cross-tools</filename> for libraries.</para> |
| 46 | <filename class="directory">${CLFS}/cross-tools</filename> for libraries.</para> |
47 | 47 | </listitem> |
48 | 48 | </varlistentry> |
49 | 49 | |
50 | 50 | <varlistentry> |
51 | | <term><parameter>--with-gmp=/cross-tools</parameter></term> |
| 51 | <term><parameter>--with-gmp=${CLFS}/cross-tools</parameter></term> |
52 | 52 | <listitem> |
53 | 53 | <para>This tells <command>configure</command> where to find GMP.</para> |
54 | 54 | </listitem> |
-
diff --git a/BOOK/cross-tools/common/ncurses.xml b/BOOK/cross-tools/common/ncurses.xml
index 048979f..e63d0fc 100644
a
|
b
|
|
32 | 32 | |
33 | 33 | <para os="a">Prepare Ncurses for compilation:</para> |
34 | 34 | |
35 | | <screen os="b"><userinput>./configure --prefix=/cross-tools \ |
| 35 | <screen os="b"><userinput>./configure --prefix=${CLFS}/cross-tools \ |
36 | 36 | --without-debug --without-shared</userinput></screen> |
37 | 37 | |
38 | 38 | <variablelist os="b1"> |
… |
… |
make -C progs tic</userinput></screen> |
63 | 63 | |
64 | 64 | <para os="e">Install <command>tic</command> with the following command:</para> |
65 | 65 | |
66 | | <screen os="f"><userinput>install -v -m755 progs/tic /cross-tools/bin</userinput></screen> |
| 66 | <screen os="f"><userinput>install -v -m755 progs/tic ${CLFS}/cross-tools/bin</userinput></screen> |
67 | 67 | |
68 | 68 | </sect2> |
69 | 69 | |
-
diff --git a/BOOK/cross-tools/mips/linux-headers.xml b/BOOK/cross-tools/mips/linux-headers.xml
index 1f93d99..bb4e4fb 100644
a
|
b
|
|
32 | 32 | |
33 | 33 | <screen os="c"><userinput>make mrproper |
34 | 34 | make ARCH=mips headers_check |
35 | | make ARCH=mips INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
| 35 | make ARCH=mips INSTALL_HDR_PATH=${CLFS}/tools headers_install</userinput></screen> |
36 | 36 | |
37 | 37 | <variablelist os="d"> |
38 | 38 | <title>The meaning of the make commands:</title> |
… |
… |
make ARCH=mips INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
50 | 50 | </varlistentry> |
51 | 51 | |
52 | 52 | <varlistentry os="d3"> |
53 | | <term><parameter>make ARCH=mips INSTALL_HDR_PATH=/tools headers_install</parameter></term> |
| 53 | <term><parameter>make ARCH=mips INSTALL_HDR_PATH=${CLFS}/tools headers_install</parameter></term> |
54 | 54 | <listitem> |
55 | 55 | <para>This will install the kernel headers into |
56 | | <filename class="directory">/tools/include</filename>.</para> |
| 56 | <filename class="directory">${CLFS}/tools/include</filename>.</para> |
57 | 57 | </listitem> |
58 | 58 | </varlistentry> |
59 | 59 | |
-
diff --git a/BOOK/cross-tools/mips64-64/gcc-final.xml b/BOOK/cross-tools/mips64-64/gcc-final.xml
index a32a8a7..953a3a7 100644
a
|
b
|
|
58 | 58 | href="gcc-static.xml" |
59 | 59 | xpointer="xpointer(//*[@os='h'])"/> |
60 | 60 | |
61 | | <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ |
62 | | ../gcc-4.8.2/configure --prefix=/cross-tools \ |
| 61 | <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ |
| 62 | ../gcc-4.8.2/configure --prefix=${CLFS}/cross-tools \ |
63 | 63 | --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \ |
64 | 64 | --with-sysroot=${CLFS} --with-local-prefix=/tools \ |
65 | 65 | --with-native-system-header-dir=/tools/include --disable-nls \ |
66 | 66 | --enable-shared --disable-static --enable-languages=c,c++ \ |
67 | 67 | --enable-__cxa_atexit --enable-c99 --enable-long-long --enable-threads=posix \ |
68 | | --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \ |
69 | | --with-gmp=/cross-tools --with-cloog=/cross-tools \ |
70 | | --with-isl=/cross-tools --with-system-zlib --enable-checking=release \ |
| 68 | --disable-multilib --with-mpc=${CLFS}/cross-tools --with-mpfr=${CLFS}/cross-tools \ |
| 69 | --with-gmp=${CLFS}/cross-tools --with-cloog=${CLFS}/cross-tools \ |
| 70 | --with-isl=${CLFS}/cross-tools --with-system-zlib --enable-checking=release \ |
71 | 71 | --enable-libstdcxx-time --with-abi=64</userinput></screen> |
72 | 72 | |
73 | 73 | <variablelist os="bg"> |
-
diff --git a/BOOK/cross-tools/mips64-64/gcc-static.xml b/BOOK/cross-tools/mips64-64/gcc-static.xml
index b49cab0..177b9fc 100644
a
|
b
|
|
67 | 67 | href="../../final-system/common/gcc.xml" |
68 | 68 | xpointer="xpointer(//*[@os='h'])"/> |
69 | 69 | |
70 | | <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ |
71 | | ../gcc-&gcc-version;/configure --prefix=/cross-tools \ |
| 70 | <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ |
| 71 | ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \ |
72 | 72 | --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \ |
73 | 73 | --with-sysroot=${CLFS} --with-local-prefix=/tools \ |
74 | 74 | --with-native-system-header-dir=/tools/include --disable-nls \ |
75 | | --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \ |
76 | | --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \ |
| 75 | --disable-shared --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \ |
| 76 | --with-isl=${CLFS}/cross-tools --with-cloog=${CLFS}/cross-tools --with-mpc=${CLFS}/cross-tools \ |
77 | 77 | --without-headers --with-newlib --disable-decimal-float --disable-libgomp \ |
78 | 78 | --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \ |
79 | 79 | --disable-libsanitizer --disable-libquadmath --disable-threads \ |
-
diff --git a/BOOK/cross-tools/mips64/glibc-n32.xml b/BOOK/cross-tools/mips64/glibc-n32.xml
index 907a244..6d384fd 100644
a
|
b
|
|
64 | 64 | ../glibc-&glibc-version;/configure --prefix=/tools \ |
65 | 65 | --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib32 \ |
66 | 66 | --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \ |
67 | | --with-binutils=/cross-tools/bin --with-headers=/tools/include \ |
| 67 | --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/tools/include \ |
68 | 68 | --enable-obsolete-rpc --cache-file=config.cache</userinput></screen> |
69 | 69 | |
70 | 70 | <variablelist os="fa"> |
-
diff --git a/BOOK/cross-tools/multilib/binutils.xml b/BOOK/cross-tools/multilib/binutils.xml
index 9a0fdf4..999508d 100644
a
|
b
|
|
48 | 48 | xpointer="xpointer(//*[@os='i'])"/> |
49 | 49 | |
50 | 50 | <screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-dir;/configure \ |
51 | | --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ |
| 51 | --prefix=${CLFS}/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ |
52 | 52 | --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \ |
53 | 53 | --disable-nls --disable-static --enable-64-bit-bfd</userinput></screen> |
54 | 54 | |
-
diff --git a/BOOK/cross-tools/multilib/gcc-final.xml b/BOOK/cross-tools/multilib/gcc-final.xml
index a562784..3920683 100644
a
|
b
|
|
58 | 58 | href="gcc-static.xml" |
59 | 59 | xpointer="xpointer(//*[@os='h'])"/> |
60 | 60 | |
61 | | <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ |
62 | | ../gcc-&gcc-version;/configure --prefix=/cross-tools \ |
| 61 | <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ |
| 62 | ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \ |
63 | 63 | --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \ |
64 | 64 | --with-sysroot=${CLFS} --with-local-prefix=/tools \ |
65 | 65 | --with-native-system-header-dir=/tools/include \ |
66 | 66 | --disable-nls --enable-shared --disable-static \ |
67 | 67 | --enable-languages=c,c++ --enable-__cxa_atexit --enable-c99 \ |
68 | | --enable-long-long --enable-threads=posix --with-mpc=/cross-tools \ |
69 | | --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \ |
70 | | --with-isl=/cross-tools --with-system-zlib --enable-checking=release \ |
| 68 | --enable-long-long --enable-threads=posix --with-mpc=${CLFS}/cross-tools \ |
| 69 | --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools --with-cloog=${CLFS}/cross-tools \ |
| 70 | --with-isl=${CLFS}/cross-tools --with-system-zlib --enable-checking=release \ |
71 | 71 | --enable-libstdcxx-time</userinput></screen> |
72 | 72 | |
73 | 73 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
-
diff --git a/BOOK/cross-tools/multilib/gcc-static.xml b/BOOK/cross-tools/multilib/gcc-static.xml
index 7eb7b7d..8583417 100644
a
|
b
|
|
67 | 67 | href="../../final-system/common/gcc.xml" |
68 | 68 | xpointer="xpointer(//*[@os='h'])"/> |
69 | 69 | |
70 | | <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ |
71 | | ../gcc-&gcc-version;/configure --prefix=/cross-tools \ |
| 70 | <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ |
| 71 | ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \ |
72 | 72 | --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \ |
73 | 73 | --with-sysroot=${CLFS} --with-local-prefix=/tools \ |
74 | 74 | --with-native-system-header-dir=/tools/include --disable-nls \ |
75 | | --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \ |
76 | | --with-cloog=/cross-tools --with-mpc=/cross-tools --without-headers \ |
| 75 | --disable-shared --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \ |
| 76 | --with-cloog=${CLFS}/cross-tools --with-mpc=${CLFS}/cross-tools --without-headers \ |
77 | 77 | --with-newlib --disable-decimal-float --disable-libgomp --disable-libmudflap \ |
78 | 78 | --disable-libssp --disable-libatomic --disable-libitm \ |
79 | 79 | --disable-libsanitizer --disable-libquadmath --disable-threads \ |
80 | | --disable-target-zlib --with-system-zlib --with-isl=/cross-tools \ |
| 80 | --disable-target-zlib --with-system-zlib --with-isl=${CLFS}/cross-tools \ |
81 | 81 | --enable-languages=c --enable-checking=release</userinput></screen> |
82 | 82 | |
83 | 83 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
-
diff --git a/BOOK/cross-tools/multilib/glibc-64bit.xml b/BOOK/cross-tools/multilib/glibc-64bit.xml
index 6029db8..a9e2378 100644
a
|
b
|
|
64 | 64 | ../glibc-&glibc-version;/configure --prefix=/tools \ |
65 | 65 | --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib64 \ |
66 | 66 | --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \ |
67 | | --with-binutils=/cross-tools/bin --with-headers=/tools/include \ |
| 67 | --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/tools/include \ |
68 | 68 | --enable-obsolete-rpc --cache-file=config.cache</userinput></screen> |
69 | 69 | |
70 | 70 | <variablelist os="dg"> |
-
diff --git a/BOOK/cross-tools/multilib/glibc.xml b/BOOK/cross-tools/multilib/glibc.xml
index d67fbc1..74ef9fa 100644
a
|
b
|
|
59 | 59 | ../glibc-&glibc-version;/configure --prefix=/tools \ |
60 | 60 | --host=${CLFS_TARGET32} --build=${CLFS_HOST} \ |
61 | 61 | --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \ |
62 | | --with-binutils=/cross-tools/bin --with-headers=/tools/include \ |
| 62 | --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/tools/include \ |
63 | 63 | --enable-obsolete-rpc --cache-file=config.cache</userinput></screen> |
64 | 64 | |
65 | 65 | <variablelist os="dg"> |
-
diff --git a/BOOK/cross-tools/ppc/linux-headers.xml b/BOOK/cross-tools/ppc/linux-headers.xml
index 849482d..6251a4f 100644
a
|
b
|
|
32 | 32 | |
33 | 33 | <screen os="c"><userinput>make mrproper |
34 | 34 | make ARCH=powerpc headers_check |
35 | | make ARCH=powerpc INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
| 35 | make ARCH=powerpc INSTALL_HDR_PATH=${CLFS}/tools headers_install</userinput></screen> |
36 | 36 | |
37 | 37 | <variablelist os="d"> |
38 | 38 | <title>The meaning of the make commands:</title> |
… |
… |
make ARCH=powerpc INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
50 | 50 | </varlistentry> |
51 | 51 | |
52 | 52 | <varlistentry os="d3"> |
53 | | <term><parameter>make ARCH=powerpc INSTALL_HDR_PATH=/tools headers_install</parameter></term> |
| 53 | <term><parameter>make ARCH=powerpc INSTALL_HDR_PATH=${CLFS}/tools headers_install</parameter></term> |
54 | 54 | <listitem> |
55 | 55 | <para>This will install the kernel headers into |
56 | | <filename class="directory">/tools/include</filename>.</para> |
| 56 | <filename class="directory">${CLFS}/tools/include</filename>.</para> |
57 | 57 | </listitem> |
58 | 58 | </varlistentry> |
59 | 59 | |
-
diff --git a/BOOK/cross-tools/sparc/linux-headers.xml b/BOOK/cross-tools/sparc/linux-headers.xml
index 23ad793..6febf76 100644
a
|
b
|
|
32 | 32 | |
33 | 33 | <screen os="c"><userinput>make mrproper |
34 | 34 | make ARCH=sparc headers_check |
35 | | make ARCH=sparc INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
| 35 | make ARCH=sparc INSTALL_HDR_PATH=${CLFS}/tools headers_install</userinput></screen> |
36 | 36 | |
37 | 37 | <variablelist os="d"> |
38 | 38 | <title>The meaning of the make commands:</title> |
… |
… |
make ARCH=sparc INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
50 | 50 | </varlistentry> |
51 | 51 | |
52 | 52 | <varlistentry os="d3"> |
53 | | <term><parameter>make ARCH=sparc INSTALL_HDR_PATH=/tools headers_install</parameter></term> |
| 53 | <term><parameter>make ARCH=sparc INSTALL_HDR_PATH=${CLFS}/tools headers_install</parameter></term> |
54 | 54 | <listitem> |
55 | 55 | <para>This will install the kernel headers into |
56 | | <filename class="directory">/tools/include</filename>.</para> |
| 56 | <filename class="directory">${CLFS}/tools/include</filename>.</para> |
57 | 57 | </listitem> |
58 | 58 | </varlistentry> |
59 | 59 | |
-
diff --git a/BOOK/cross-tools/sparc64/linux-headers.xml b/BOOK/cross-tools/sparc64/linux-headers.xml
index a61757f..d9b6bab 100644
a
|
b
|
|
32 | 32 | |
33 | 33 | <screen os="c"><userinput>make mrproper |
34 | 34 | make ARCH=sparc64 headers_check |
35 | | make ARCH=sparc64 INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
| 35 | make ARCH=sparc64 INSTALL_HDR_PATH=${CLFS}/tools headers_install</userinput></screen> |
36 | 36 | |
37 | 37 | <variablelist os="d"> |
38 | 38 | <title>The meaning of the make commands:</title> |
… |
… |
make ARCH=sparc64 INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
50 | 50 | </varlistentry> |
51 | 51 | |
52 | 52 | <varlistentry os="d3"> |
53 | | <term><parameter>make ARCH=sparc64 INSTALL_HDR_PATH=/tools headers_install</parameter></term> |
| 53 | <term><parameter>make ARCH=sparc64 INSTALL_HDR_PATH=${CLFS}/tools headers_install</parameter></term> |
54 | 54 | <listitem> |
55 | 55 | <para>This will install the kernel headers into |
56 | | <filename class="directory">/tools/include</filename>.</para> |
| 56 | <filename class="directory">${CLFS}/tools/include</filename>.</para> |
57 | 57 | </listitem> |
58 | 58 | </varlistentry> |
59 | 59 | |
-
diff --git a/BOOK/cross-tools/x86/linux-headers.xml b/BOOK/cross-tools/x86/linux-headers.xml
index 7db269a..e928736 100644
a
|
b
|
|
32 | 32 | |
33 | 33 | <screen os="c"><userinput>make mrproper |
34 | 34 | make ARCH=i386 headers_check |
35 | | make ARCH=i386 INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
| 35 | make ARCH=i386 INSTALL_HDR_PATH=${CLFS}/tools headers_install</userinput></screen> |
36 | 36 | |
37 | 37 | <variablelist os="d"> |
38 | 38 | <title>The meaning of the make commands:</title> |
… |
… |
make ARCH=i386 INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
50 | 50 | </varlistentry> |
51 | 51 | |
52 | 52 | <varlistentry os="d3"> |
53 | | <term><parameter>make ARCH=i386 INSTALL_HDR_PATH=/tools headers_install</parameter></term> |
| 53 | <term><parameter>make ARCH=i386 INSTALL_HDR_PATH=${CLFS}/tools headers_install</parameter></term> |
54 | 54 | <listitem> |
55 | 55 | <para>This will install the kernel headers into |
56 | | <filename class="directory">/tools/include</filename>.</para> |
| 56 | <filename class="directory">${CLFS}/tools/include</filename>.</para> |
57 | 57 | </listitem> |
58 | 58 | </varlistentry> |
59 | 59 | |
-
diff --git a/BOOK/cross-tools/x86_64/linux-headers.xml b/BOOK/cross-tools/x86_64/linux-headers.xml
index 7253dd0..71fdb49 100644
a
|
b
|
|
32 | 32 | |
33 | 33 | <screen os="c"><userinput>make mrproper |
34 | 34 | make ARCH=x86_64 headers_check |
35 | | make ARCH=x86_64 INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
| 35 | make ARCH=x86_64 INSTALL_HDR_PATH=${CLFS}/tools headers_install</userinput></screen> |
36 | 36 | |
37 | 37 | <variablelist os="d"> |
38 | 38 | <title>The meaning of the make commands:</title> |
… |
… |
make ARCH=x86_64 INSTALL_HDR_PATH=/tools headers_install</userinput></screen> |
50 | 50 | </varlistentry> |
51 | 51 | |
52 | 52 | <varlistentry os="d3"> |
53 | | <term><parameter>make ARCH=x86_64 INSTALL_HDR_PATH=/tools headers_install</parameter></term> |
| 53 | <term><parameter>make ARCH=x86_64 INSTALL_HDR_PATH=${CLFS}/tools headers_install</parameter></term> |
54 | 54 | <listitem> |
55 | 55 | <para>This will install the kernel headers into |
56 | | <filename class="directory">/tools/include</filename>.</para> |
| 56 | <filename class="directory">${CLFS}/tools/include</filename>.</para> |
57 | 57 | </listitem> |
58 | 58 | </varlistentry> |
59 | 59 | |
-
diff --git a/BOOK/final-preps/creatingcrossdir.xml b/BOOK/final-preps/creatingcrossdir.xml
index f0fdc2a..dcb638f 100644
a
|
b
|
|
23 | 23 | |
24 | 24 | <screen><userinput>install -dv ${CLFS}/cross-tools</userinput></screen> |
25 | 25 | |
26 | | <para>The next step is to create a <filename |
27 | | class="symlink">/cross-tools</filename> symlink on the host system. |
28 | | This will point to the newly-created directory on the CLFS partition. |
29 | | Run this command as <systemitem class="username">root</systemitem> as well:</para> |
30 | | |
31 | | <screen><userinput>ln -sv ${CLFS}/cross-tools /</userinput></screen> |
32 | | |
33 | 26 | </sect1> |
-
diff --git a/BOOK/final-preps/creatingtoolsdir.xml b/BOOK/final-preps/creatingtoolsdir.xml
index ec27f39..1c93d50 100644
a
|
b
|
|
25 | 25 | |
26 | 26 | <screen><userinput>install -dv ${CLFS}/tools</userinput></screen> |
27 | 27 | |
28 | | <para>The next step is to create a <filename class="symlink">/tools</filename> |
29 | | symlink on the host system. This will point to the newly-created directory |
30 | | on the CLFS partition. Run this command as <systemitem |
31 | | class="username">root</systemitem> as well:</para> |
32 | | |
33 | | <screen><userinput>ln -sv ${CLFS}/tools /</userinput></screen> |
34 | | |
35 | 28 | <note> |
36 | 29 | <para>The above command is correct. The <command>ln</command> command |
37 | 30 | has a few syntactic variations, so be sure to check <command>info |
… |
… |
|
39 | 32 | what you may think is an error.</para> |
40 | 33 | </note> |
41 | 34 | |
42 | | <para>The created symlink enables the toolchain to be compiled so that |
43 | | it always refers to <filename class="directory">/tools</filename>, |
44 | | meaning that the compiler, assembler, and linker will work. This will |
45 | | provide a common place for our temporary tools system.</para> |
46 | | |
47 | 35 | </sect1> |
-
diff --git a/BOOK/final-preps/settingenviron.xml b/BOOK/final-preps/settingenviron.xml
index 0b82f75..3ae42b5 100644
a
|
b
|
EOF</userinput></screen> |
43 | 43 | umask 022 |
44 | 44 | CLFS=/mnt/clfs |
45 | 45 | LC_ALL=POSIX |
46 | | PATH=/cross-tools/bin:/bin:/usr/bin |
| 46 | PATH=${CLFS}/cross-tools/bin:/bin:/usr/bin |
47 | 47 | export CLFS LC_ALL PATH</literal> |
48 | 48 | EOF</userinput></screen> |
49 | 49 | |
… |
… |
EOF</userinput></screen> |
55 | 55 | be used as soon as they are installed. By switching off the hash function, |
56 | 56 | the shell will always search the <envar>PATH</envar> when a program is to |
57 | 57 | be run. As such, the shell will find the newly compiled tools in |
58 | | <filename class="directory">/cross-tools</filename> as soon as they are |
| 58 | <filename class="directory">${CLFS}/cross-tools</filename> as soon as they are |
59 | 59 | available without remembering a previous version of the same program in a |
60 | 60 | different location.</para> |
61 | 61 | |
… |
… |
EOF</userinput></screen> |
78 | 78 | (the two are equivalent) ensures that everything will work as expected in |
79 | 79 | the chroot environment.</para> |
80 | 80 | |
81 | | <para os="j">By putting <filename class="directory">/cross-tools/bin</filename> |
| 81 | <para os="j">By putting <filename class="directory">${CLFS}/cross-tools/bin</filename> |
82 | 82 | at the beginning of the <envar>PATH</envar>, the cross-compiler |
83 | 83 | built in <xref linkend="chapter-cross-tools"/> will be picked up by |
84 | 84 | the build process for the temp-system packages before anything that |
-
diff --git a/BOOK/temp-system/64/gcc.xml b/BOOK/temp-system/64/gcc.xml
index fc71f1a..3905956 100644
a
|
b
|
|
76 | 76 | --with-local-prefix=/tools --enable-long-long --enable-c99 --enable-shared \ |
77 | 77 | --enable-threads=posix --disable-nls --enable-__cxa_atexit \ |
78 | 78 | --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \ |
79 | | --with-native-system-header-dir=/tools/include --enable-checking=release \ |
| 79 | --with-native-system-header-dir=${CLFS}/tools/include --enable-checking=release \ |
80 | 80 | --enable-libstdcxx-time</userinput></screen> |
81 | 81 | |
82 | 82 | <variablelist> |
-
diff --git a/BOOK/temp-system/64/mpc.xml b/BOOK/temp-system/64/mpc.xml
index 8b93910..17d10af 100644
a
|
b
|
|
27 | 27 | xpointer="xpointer(//*[@os='a'])"/> |
28 | 28 | |
29 | 29 | <screen os="b"><userinput>CC="${CC} ${BUILD64}" \ |
30 | | ./configure --prefix=/tools \ |
| 30 | ./configure --prefix=/tools --with-sysroot \ |
31 | 31 | --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen> |
32 | 32 | |
33 | 33 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
-
diff --git a/BOOK/temp-system/64/mpfr.xml b/BOOK/temp-system/64/mpfr.xml
index 30af93c..4b6cddc 100644
a
|
b
|
|
36 | 36 | |
37 | 37 | <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \ |
38 | 38 | --build=${CLFS_HOST} --host=${CLFS_TARGET} \ |
39 | | --enable-shared</userinput></screen> |
| 39 | --enable-shared --with-sysroot</userinput></screen> |
40 | 40 | |
41 | 41 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
42 | 42 | href="../common/mpfr.xml" |
-
diff --git a/BOOK/temp-system/64/util-linux.xml b/BOOK/temp-system/64/util-linux.xml
index 7edeb89..4e6a22f 100644
a
|
b
|
|
24 | 24 | |
25 | 25 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
26 | 26 | href="../common/util-linux.xml" |
| 27 | xpointer="xpointer(//*[@os='s1'])"/> |
| 28 | |
| 29 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
| 30 | href="../common/util-linux.xml" |
| 31 | xpointer="xpointer(//*[@os='s2'])"/> |
| 32 | |
| 33 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
| 34 | href="../common/util-linux.xml" |
27 | 35 | xpointer="xpointer(//*[@os='a'])"/> |
28 | 36 | |
29 | 37 | <screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \ |
-
diff --git a/BOOK/temp-system/common/bash.xml b/BOOK/temp-system/common/bash.xml
index 5fa0642..2fdb458 100644
a
|
b
|
EOF</userinput></screen> |
88 | 88 | href="../../final-system/common/bash.xml" |
89 | 89 | xpointer="xpointer(//*[@os='g'])"/> |
90 | 90 | |
91 | | <screen os="h"><userinput>make install</userinput></screen> |
| 91 | <screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
92 | 92 | |
93 | 93 | </sect2> |
94 | 94 | |
-
diff --git a/BOOK/temp-system/common/binutils.xml b/BOOK/temp-system/common/binutils.xml
index ec1dd0f..eafdb95 100644
a
|
b
|
|
61 | 61 | href="../../cross-tools/common/binutils.xml" |
62 | 62 | xpointer="xpointer(//*[@os='bh'])"/> |
63 | 63 | |
64 | | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
65 | | href="../../cross-tools/common/binutils.xml" |
66 | | xpointer="xpointer(//*[@os='bi'])"/> |
| 64 | <screen os="bi"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
67 | 65 | |
68 | 66 | </sect2> |
69 | 67 | |
-
diff --git a/BOOK/temp-system/common/bzip2.xml b/BOOK/temp-system/common/bzip2.xml
index bdd49a8..d5fc790 100644
a
|
b
|
sed -e 's@^\(all:.*\) test@\1@g' Makefile.orig > Makefile</userinput></screen |
37 | 37 | |
38 | 38 | <para os="cd">Install the package:</para> |
39 | 39 | |
40 | | <screen os="ce"><userinput>make PREFIX=/tools install</userinput></screen> |
| 40 | <screen os="ce"><userinput>make PREFIX=${CLFS}/tools install</userinput></screen> |
41 | 41 | |
42 | 42 | </sect2> |
43 | 43 | |
-
diff --git a/BOOK/temp-system/common/check.xml b/BOOK/temp-system/common/check.xml
index ef36a19..5ece3d5 100644
a
|
b
|
|
49 | 49 | |
50 | 50 | <para os="i">Install the package:</para> |
51 | 51 | |
52 | | <screen os="j"><userinput>make install</userinput></screen> |
| 52 | <screen os="j"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
53 | 53 | |
54 | 54 | </sect2> |
55 | 55 | |
-
diff --git a/BOOK/temp-system/common/cloog.xml b/BOOK/temp-system/common/cloog.xml
index d266518..74a9cde 100644
a
|
b
|
|
41 | 41 | |
42 | 42 | <para os="e">Install the package:</para> |
43 | 43 | |
44 | | <screen os="f"><userinput>make install</userinput></screen> |
| 44 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
45 | 45 | |
46 | 46 | </sect2> |
47 | 47 | |
-
diff --git a/BOOK/temp-system/common/coreutils.xml b/BOOK/temp-system/common/coreutils.xml
index 5b29524..53f109c 100644
a
|
b
|
EOF</userinput></screen> |
61 | 61 | |
62 | 62 | <para os="bh">Install the package:</para> |
63 | 63 | |
64 | | <screen os="bi"><userinput>make install</userinput></screen> |
| 64 | <screen os="bi"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
65 | 65 | |
66 | 66 | </sect2> |
67 | 67 | |
-
diff --git a/BOOK/temp-system/common/diffutils.xml b/BOOK/temp-system/common/diffutils.xml
index 0fdafee..f72223b 100644
a
|
b
|
|
33 | 33 | |
34 | 34 | <para os="e">Install the package:</para> |
35 | 35 | |
36 | | <screen os="f"><userinput>make install</userinput></screen> |
| 36 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
37 | 37 | |
38 | 38 | </sect2> |
39 | 39 | |
-
diff --git a/BOOK/temp-system/common/file.xml b/BOOK/temp-system/common/file.xml
index fbe6d70..b1b1fab 100644
a
|
b
|
|
33 | 33 | |
34 | 34 | <para os="f">Install the package:</para> |
35 | 35 | |
36 | | <screen os="g"><userinput>make install</userinput></screen> |
| 36 | <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
37 | 37 | |
38 | 38 | </sect2> |
39 | 39 | |
-
diff --git a/BOOK/temp-system/common/findutils.xml b/BOOK/temp-system/common/findutils.xml
index 24969b5..e3d82b6 100644
a
|
b
|
echo "ac_cv_func_fnmatch_gnu=yes" >> config.cache</userinput></screen> |
48 | 48 | href="../../final-system/common/findutils.xml" |
49 | 49 | xpointer="xpointer(//*[@os='g'])"/> |
50 | 50 | |
51 | | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
52 | | href="../../final-system/common/findutils.xml" |
53 | | xpointer="xpointer(//*[@os='h'])"/> |
| 51 | <screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
54 | 52 | |
55 | 53 | </sect2> |
56 | 54 | |
-
diff --git a/BOOK/temp-system/common/gawk.xml b/BOOK/temp-system/common/gawk.xml
index 9a62dfe..e15297a 100644
a
|
b
|
|
33 | 33 | |
34 | 34 | <para os="e">Install the package:</para> |
35 | 35 | |
36 | | <screen os="f"><userinput>make install</userinput></screen> |
| 36 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
37 | 37 | |
38 | 38 | </sect2> |
39 | 39 | |
-
diff --git a/BOOK/temp-system/common/gcc.xml b/BOOK/temp-system/common/gcc.xml
index 6e02cab..1ba2540 100644
a
|
b
|
|
74 | 74 | --with-local-prefix=/tools --enable-long-long --enable-c99 --enable-shared \ |
75 | 75 | --enable-threads=posix --disable-multilib --disable-nls \ |
76 | 76 | --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \ |
77 | | --with-system-zlib --with-native-system-header-dir=/tools/include \ |
| 77 | --with-system-zlib --with-native-system-header-dir=${CLFS}/tools/include \ |
78 | 78 | --disable-libssp --enable-checking=release --enable-libstdcxx-time</userinput></screen> |
79 | 79 | |
80 | 80 | <variablelist os="cl"> |
… |
… |
sed "/^HOST_\(GMP\|ISL\|CLOOG\)\(LIBS\|INC\)/s:/tools:/cross-tools:g" \ |
105 | 105 | |
106 | 106 | <para os="co">Install the package:</para> |
107 | 107 | |
108 | | <screen os="cp"><userinput>make install</userinput></screen> |
| 108 | <screen os="cp"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
109 | 109 | |
110 | 110 | </sect2> |
111 | 111 | |
-
diff --git a/BOOK/temp-system/common/gettext.xml b/BOOK/temp-system/common/gettext.xml
index 22f876e..6c7d8bb 100644
a
|
b
|
make -C src msgfmt msgmerge xgettext</userinput></screen> |
49 | 49 | <para os="g">Install the <command>msgfmt</command>, |
50 | 50 | <command>msgmerge</command> and <command>xgettext</command> binaries:</para> |
51 | 51 | |
52 | | <screen os="h"><userinput>cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin</userinput></screen> |
| 52 | <screen os="h"><userinput>cp -v src/{msgfmt,msgmerge,xgettext} ${CLFS}/tools/bin</userinput></screen> |
53 | 53 | |
54 | 54 | </sect2> |
55 | 55 | |
-
diff --git a/BOOK/temp-system/common/gmp.xml b/BOOK/temp-system/common/gmp.xml
index fea731b..dcd8eae 100644
a
|
b
|
|
44 | 44 | |
45 | 45 | <para os="e">Install the package:</para> |
46 | 46 | |
47 | | <screen os="f"><userinput>make install</userinput></screen> |
| 47 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
48 | 48 | |
49 | 49 | </sect2> |
50 | 50 | |
-
diff --git a/BOOK/temp-system/common/grep.xml b/BOOK/temp-system/common/grep.xml
index f5918c3..4757a71 100644
a
|
b
|
|
57 | 57 | href="../../final-system/common/grep.xml" |
58 | 58 | xpointer="xpointer(//*[@os='f'])"/> |
59 | 59 | |
60 | | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
61 | | href="../../final-system/common/grep.xml" |
62 | | xpointer="xpointer(//*[@os='g'])"/> |
| 60 | <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
63 | 61 | |
64 | 62 | </sect2> |
65 | 63 | |
-
diff --git a/BOOK/temp-system/common/gzip.xml b/BOOK/temp-system/common/gzip.xml
index cc8e846..03e9cc6 100644
a
|
b
|
|
41 | 41 | href="../../final-system/common/gzip.xml" |
42 | 42 | xpointer="xpointer(//*[@os='f'])"/> |
43 | 43 | |
44 | | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
45 | | href="../../final-system/common/gzip.xml" |
46 | | xpointer="xpointer(//*[@os='g'])"/> |
| 44 | <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
47 | 45 | |
48 | 46 | </sect2> |
49 | 47 | |
-
diff --git a/BOOK/temp-system/common/isl.xml b/BOOK/temp-system/common/isl.xml
index 7d1c2de..00b3365 100644
a
|
b
|
|
33 | 33 | |
34 | 34 | <para os="e">Install the package:</para> |
35 | 35 | |
36 | | <screen os="f"><userinput>make install</userinput></screen> |
| 36 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
37 | 37 | |
38 | 38 | </sect2> |
39 | 39 | |
-
diff --git a/BOOK/temp-system/common/m4.xml b/BOOK/temp-system/common/m4.xml
index 67a87b6..3928e08 100644
a
|
b
|
EOF</userinput></screen> |
49 | 49 | |
50 | 50 | <para os="e">Install the package:</para> |
51 | 51 | |
52 | | <screen os="f"><userinput>make install</userinput></screen> |
| 52 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
53 | 53 | |
54 | 54 | </sect2> |
55 | 55 | |
-
diff --git a/BOOK/temp-system/common/make.xml b/BOOK/temp-system/common/make.xml
index 3a71d35..a07df5e 100644
a
|
b
|
|
41 | 41 | href="../../final-system/common/make.xml" |
42 | 42 | xpointer="xpointer(//*[@os='f'])"/> |
43 | 43 | |
44 | | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
45 | | href="../../final-system/common/make.xml" |
46 | | xpointer="xpointer(//*[@os='g'])"/> |
| 44 | <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
47 | 45 | |
48 | 46 | </sect2> |
49 | 47 | |
-
diff --git a/BOOK/temp-system/common/mpc.xml b/BOOK/temp-system/common/mpc.xml
index 41c3c1d..9b86139 100644
a
|
b
|
|
24 | 24 | |
25 | 25 | <para os="a">Prepare MPC for compilation:</para> |
26 | 26 | |
27 | | <screen os="b"><userinput>./configure --prefix=/tools \ |
| 27 | <screen os="b"><userinput>./configure --prefix=/tools --with-sysroot \ |
28 | 28 | --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen> |
29 | 29 | |
30 | 30 | <para os="c">Compile the package:</para> |
… |
… |
|
33 | 33 | |
34 | 34 | <para os="e">Install the package:</para> |
35 | 35 | |
36 | | <screen os="f"><userinput>make install</userinput></screen> |
| 36 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
37 | 37 | |
38 | 38 | </sect2> |
39 | 39 | |
-
diff --git a/BOOK/temp-system/common/mpfr.xml b/BOOK/temp-system/common/mpfr.xml
index 2c6ea76..983a385 100644
a
|
b
|
|
34 | 34 | |
35 | 35 | <screen os="b"><userinput>./configure --prefix=/tools \ |
36 | 36 | --build=${CLFS_HOST} --host=${CLFS_TARGET} \ |
37 | | --enable-shared</userinput></screen> |
| 37 | --enable-shared --with-sysroot</userinput></screen> |
38 | 38 | |
39 | 39 | <para os="c">Compile the package:</para> |
40 | 40 | |
… |
… |
|
42 | 42 | |
43 | 43 | <para os="e">Install the package:</para> |
44 | 44 | |
45 | | <screen os="f"><userinput>make install</userinput></screen> |
| 45 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
46 | 46 | |
47 | 47 | </sect2> |
48 | 48 | |
-
diff --git a/BOOK/temp-system/common/ncurses.xml b/BOOK/temp-system/common/ncurses.xml
index 70543a7..1f13e2e 100644
a
|
b
|
|
94 | 94 | href="../../final-system/common/ncurses.xml" |
95 | 95 | xpointer="xpointer(//*[@os='f'])"/> |
96 | 96 | |
97 | | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
98 | | href="../../final-system/common/ncurses.xml" |
99 | | xpointer="xpointer(//*[@os='g'])"/> |
| 97 | <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
100 | 98 | |
101 | 99 | </sect2> |
102 | 100 | |
-
diff --git a/BOOK/temp-system/common/patch.xml b/BOOK/temp-system/common/patch.xml
index d2c2674..51e9699 100644
a
|
b
|
|
33 | 33 | |
34 | 34 | <para os="e">Install the package:</para> |
35 | 35 | |
36 | | <screen os="f"><userinput>make install</userinput></screen> |
| 36 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
37 | 37 | |
38 | 38 | </sect2> |
39 | 39 | |
-
diff --git a/BOOK/temp-system/common/sed.xml b/BOOK/temp-system/common/sed.xml
index 607b0a6..2ed446a 100644
a
|
b
|
|
33 | 33 | |
34 | 34 | <para os="e">Install the package:</para> |
35 | 35 | |
36 | | <screen os="f"><userinput>make install</userinput></screen> |
| 36 | <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
37 | 37 | |
38 | 38 | </sect2> |
39 | 39 | |
-
diff --git a/BOOK/temp-system/common/tar.xml b/BOOK/temp-system/common/tar.xml
index da72632..e5488cd 100644
a
|
b
|
EOF</userinput></screen> |
57 | 57 | href="../../final-system/common/tar.xml" |
58 | 58 | xpointer="xpointer(//*[@os='f'])"/> |
59 | 59 | |
60 | | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
61 | | href="../../final-system/common/tar.xml" |
62 | | xpointer="xpointer(//*[@os='g'])"/> |
| 60 | <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
63 | 61 | |
64 | 62 | </sect2> |
65 | 63 | |
-
diff --git a/BOOK/temp-system/common/texinfo.xml b/BOOK/temp-system/common/texinfo.xml
index b4a62e3..be8adaf 100644
a
|
b
|
|
54 | 54 | href="../../final-system/common/texinfo.xml" |
55 | 55 | xpointer="xpointer(//*[@os='f'])"/> |
56 | 56 | |
57 | | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
58 | | href="../../final-system/common/texinfo.xml" |
59 | | xpointer="xpointer(//*[@os='g'])"/> |
| 57 | <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
60 | 58 | |
61 | 59 | </sect2> |
62 | 60 | |
-
diff --git a/BOOK/temp-system/common/util-linux.xml b/BOOK/temp-system/common/util-linux.xml
index 6e6f78b..7e8e999 100644
a
|
b
|
|
22 | 22 | <sect2 role="installation"> |
23 | 23 | <title>Installation of Util-linux</title> |
24 | 24 | |
| 25 | <para os="s1">Allow librt to find libpthread:</para> |
| 26 | |
| 27 | <screen os="s2"><userinput>cp -v Makefile.in{,.orig} |
| 28 | sed 's/-lrt/& -lpthread/' Makefile.in.orig > Makefile.in</userinput></screen> |
| 29 | |
25 | 30 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
26 | 31 | href="../../final-system/common/util-linux.xml" |
27 | 32 | xpointer="xpointer(//*[@os='a'])"/> |
… |
… |
|
53 | 58 | href="../../final-system/common/util-linux.xml" |
54 | 59 | xpointer="xpointer(//*[@os='g'])"/> |
55 | 60 | |
56 | | <screen os="h"><userinput>make install</userinput></screen> |
| 61 | <screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
57 | 62 | |
58 | 63 | </sect2> |
59 | 64 | |
-
diff --git a/BOOK/temp-system/common/vim.xml b/BOOK/temp-system/common/vim.xml
index 72460c3..1dee497 100644
a
|
b
|
EOF</userinput></screen> |
106 | 106 | href="../../final-system/common/vim.xml" |
107 | 107 | xpointer="xpointer(//*[@os='j'])"/> |
108 | 108 | |
109 | | <screen os="k"><userinput>make install</userinput></screen> |
| 109 | <screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
110 | 110 | |
111 | 111 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
112 | 112 | href="../../final-system/common/vim.xml" |
113 | 113 | xpointer="xpointer(//*[@os='l'])"/> |
114 | 114 | |
115 | | <screen os="m"><userinput>ln -sv vim /tools/bin/vi</userinput></screen> |
| 115 | <screen os="m"><userinput>ln -sv vim ${CLFS}/tools/bin/vi</userinput></screen> |
116 | 116 | |
117 | 117 | <para os="tv1" >Create a temporary vimrc to make it function more the way you may |
118 | 118 | expect it to. This is explained more in the final system:</para> |
119 | 119 | |
120 | | <screen os="tv2"><userinput>cat > /tools/etc/vimrc << "EOF" |
| 120 | <screen os="tv2"><userinput>cat > ${CLFS}/tools/etc/vimrc << "EOF" |
121 | 121 | <literal>" Begin /tools/etc/vimrc |
122 | 122 | |
123 | 123 | set nocompatible |
-
diff --git a/BOOK/temp-system/common/xz.xml b/BOOK/temp-system/common/xz.xml
index 3fd8564..24baaed 100644
a
|
b
|
|
39 | 39 | |
40 | 40 | <para os="ce">Install the package:</para> |
41 | 41 | |
42 | | <screen os="cf"><userinput>make install</userinput></screen> |
| 42 | <screen os="cf"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
43 | 43 | |
44 | 44 | </sect2> |
45 | 45 | |
-
diff --git a/BOOK/temp-system/common/zlib.xml b/BOOK/temp-system/common/zlib.xml
index dc6224a..14e9316 100644
a
|
b
|
|
40 | 40 | href="../../final-system/common/zlib.xml" |
41 | 41 | xpointer="xpointer(//*[@os='f'])"/> |
42 | 42 | |
43 | | <screen os="g"><userinput>make install</userinput></screen> |
| 43 | <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen> |
44 | 44 | |
45 | 45 | </sect2> |
46 | 46 | |
-
diff --git a/BOOK/temp-system/mips64-64/gcc.xml b/BOOK/temp-system/mips64-64/gcc.xml
index 89ba7e6..4e258b6 100644
a
|
b
|
|
77 | 77 | --enable-shared --enable-threads=posix --disable-nls --enable-__cxa_atexit \ |
78 | 78 | --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \ |
79 | 79 | --enable-checking=release --enable-libstdcxx-time \ |
80 | | --with-native-system-header-dir=/tools/include</userinput></screen> |
| 80 | --with-native-system-header-dir=${CLFS}/tools/include</userinput></screen> |
81 | 81 | |
82 | 82 | <variablelist> |
83 | 83 | <title>The meaning of the new configure options:</title> |
-
diff --git a/BOOK/temp-system/mips64/gcc.xml b/BOOK/temp-system/mips64/gcc.xml
index d1192ad..995b202 100644
a
|
b
|
|
78 | 78 | --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \ |
79 | 79 | --disable-libstdcxx-pch --with-abi=64 --with-system-zlib \ |
80 | 80 | --enable-checking=release --enable-libstdcxx-time \ |
81 | | --with-native-system-header-dir=/tools/include</userinput></screen> |
| 81 | --with-native-system-header-dir=${CLFS}/tools/include</userinput></screen> |
82 | 82 | |
83 | 83 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
84 | 84 | href="../multilib/gcc.xml" |
-
diff --git a/BOOK/temp-system/multilib/gcc.xml b/BOOK/temp-system/multilib/gcc.xml
index c54a610..dadabca 100644
a
|
b
|
|
76 | 76 | --target=${CLFS_TARGET} --with-local-prefix=/tools --enable-long-long \ |
77 | 77 | --enable-c99 --enable-shared --enable-threads=posix --disable-nls \ |
78 | 78 | --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \ |
79 | | --with-system-zlib --with-native-system-header-dir=/tools/include \ |
| 79 | --with-system-zlib --with-native-system-header-dir=${CLFS}/tools/include \ |
80 | 80 | --disable-libssp --enable-libstdcxx-time --enable-checking=release</userinput></screen> |
81 | 81 | |
82 | 82 | <variablelist os="dd"> |
-
diff --git a/BOOK/temp-system/multilib/make.xml b/BOOK/temp-system/multilib/make.xml
index 7aff7ce..9e5be6e 100644
a
|
b
|
|
42 | 42 | xpointer="xpointer(//*[@os='f'])"/> |
43 | 43 | |
44 | 44 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
45 | | href="../../final-system/common/make.xml" |
| 45 | href="../common/make.xml" |
46 | 46 | xpointer="xpointer(//*[@os='g'])"/> |
47 | 47 | |
48 | 48 | </sect2> |
-
diff --git a/BOOK/temp-system/multilib/mpc.xml b/BOOK/temp-system/multilib/mpc.xml
index e874455..c51a2d8 100644
a
|
b
|
|
27 | 27 | xpointer="xpointer(//*[@os='a'])"/> |
28 | 28 | |
29 | 29 | <screen os="b"><userinput>CC="${CC} ${BUILD64}" \ |
30 | | ./configure --prefix=/tools \ |
| 30 | ./configure --prefix=/tools --with-sysroot \ |
31 | 31 | --build=${CLFS_HOST} --host=${CLFS_TARGET} \ |
32 | 32 | --libdir=/tools/lib64</userinput></screen> |
33 | 33 | |
-
diff --git a/BOOK/temp-system/multilib/mpfr.xml b/BOOK/temp-system/multilib/mpfr.xml
index 773469e..7a2da19 100644
a
|
b
|
|
36 | 36 | |
37 | 37 | <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \ |
38 | 38 | --build=${CLFS_HOST} --host=${CLFS_TARGET} \ |
39 | | --libdir=/tools/lib64 --enable-shared</userinput></screen> |
| 39 | --libdir=/tools/lib64 --enable-shared --with-sysroot</userinput></screen> |
40 | 40 | |
41 | 41 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
42 | 42 | href="../common/mpfr.xml" |
-
diff --git a/BOOK/temp-system/multilib/util-linux.xml b/BOOK/temp-system/multilib/util-linux.xml
index a983f0b..adfae10 100644
a
|
b
|
|
24 | 24 | |
25 | 25 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
26 | 26 | href="../common/util-linux.xml" |
| 27 | xpointer="xpointer(//*[@os='s1'])"/> |
| 28 | |
| 29 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
| 30 | href="../common/util-linux.xml" |
| 31 | xpointer="xpointer(//*[@os='s2'])"/> |
| 32 | |
| 33 | <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" |
| 34 | href="../common/util-linux.xml" |
27 | 35 | xpointer="xpointer(//*[@os='a'])"/> |
28 | 36 | |
29 | 37 | <screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \ |
-
diff --git a/BOOK/temp-system/ppc64-64/gcc.xml b/BOOK/temp-system/ppc64-64/gcc.xml
index 4625400..61ca6c4 100644
a
|
b
|
|
76 | 76 | --with-local-prefix=/tools --enable-long-long --enable-c99 \ |
77 | 77 | --enable-shared --enable-threads=posix --disable-nls --enable-__cxa_atexit \ |
78 | 78 | --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \ |
79 | | --with-native-system-header-dir=/tools/include --enable-checking=release \ |
| 79 | --with-native-system-header-dir=${CLFS}/tools/include --enable-checking=release \ |
80 | 80 | --enable-libstdcxx-time</userinput></screen> |
81 | 81 | |
82 | 82 | <variablelist> |