diff --git a/BOOK/boot/common/boot-scripts.xml b/BOOK/boot/common/boot-scripts.xml index f0bb2ae..9256e8f 100644 --- a/BOOK/boot/common/boot-scripts.xml +++ b/BOOK/boot/common/boot-scripts.xml @@ -27,7 +27,7 @@ Install the package: -make DESTDIR=/tools install-boot-scripts +make DESTDIR=${CLFS}/tools install-boot-scripts The setclock script reads the time from the hardware clock, also known as the BIOS or the Complementary Metal Oxide @@ -51,7 +51,7 @@ to a value of (zero) if the hardware clock is not set to UTC time. -cat > /tools/etc/sysconfig/clock << "EOF" +cat > ${CLFS}/tools/etc/sysconfig/clock << "EOF" # Begin /tools/etc/sysconfig/clock UTC=1 diff --git a/BOOK/boot/common/e2fsprogs.xml b/BOOK/boot/common/e2fsprogs.xml index 4d4bdd5..ce7dccb 100644 --- a/BOOK/boot/common/e2fsprogs.xml +++ b/BOOK/boot/common/e2fsprogs.xml @@ -64,17 +64,13 @@ href="../../final-system/common/e2fsprogs.xml" xpointer="xpointer(//*[@os='i'])"/> - +make DESTDIR=${CLFS} install - +make DESTDIR=${CLFS} install-libs diff --git a/BOOK/boot/common/eudev.xml b/BOOK/boot/common/eudev.xml index 132ffc7..952d3a8 100644 --- a/BOOK/boot/common/eudev.xml +++ b/BOOK/boot/common/eudev.xml @@ -40,17 +40,17 @@ Install the package: -make install +make DESTDIR=${CLFS} install Create a directory for storing firmware that can be loaded by udev: -install -dv /tools/lib/firmware +install -dv ${CLFS}/tools/lib/firmware Create a dummy rule so that Eudev will name ethernet devices properly for the system. echo "# dummy, so that network is once again on eth*" \ -> /tools/etc/udev/rules.d/80-net-name-slot.rules +> ${CLFS}/tools/etc/udev/rules.d/80-net-name-slot.rules diff --git a/BOOK/boot/common/kmod.xml b/BOOK/boot/common/kmod.xml index 283c8f6..b82f67c 100644 --- a/BOOK/boot/common/kmod.xml +++ b/BOOK/boot/common/kmod.xml @@ -63,15 +63,15 @@ sed '/dirname_default_prefix /s@/lib/modules@/tools&@' \ href="../../final-system/common/kmod.xml" xpointer="xpointer(//*[@os='g'])"/> -make install +make DESTDIR=${CLFS} install -ln -sfv kmod /tools/bin/lsmod +ln -sfv kmod ${CLFS}/tools/bin/lsmod for tool in depmod insmod modprobe modinfo rmmod; do - ln -sv ../bin/kmod /tools/sbin/${tool} + ln -sv ../bin/kmod ${CLFS}/tools/sbin/${tool} done diff --git a/BOOK/boot/common/shadow.xml b/BOOK/boot/common/shadow.xml index 2add343..1b2aa0c 100644 --- a/BOOK/boot/common/shadow.xml +++ b/BOOK/boot/common/shadow.xml @@ -52,7 +52,7 @@ sed 's/\(^suidu*bins = \).*/\1/' src/Makefile.orig > src/Makefile Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/boot/common/sysvinit.xml b/BOOK/boot/common/sysvinit.xml index eff26c7..7a3a576 100644 --- a/BOOK/boot/common/sysvinit.xml +++ b/BOOK/boot/common/sysvinit.xml @@ -38,7 +38,7 @@ make -C src CC="${CC}" Install the package: -make -C src ROOT=/tools install +make -C src ROOT=${CLFS}/tools install @@ -57,7 +57,7 @@ make -C src CC="${CC}" Create a new file /tools/etc/inittab by running the following: -cat > /tools/etc/inittab << "EOF" +cat > ${CLFS}/tools/etc/inittab << "EOF" # Begin /tools/etc/inittab id:3:initdefault: @@ -82,7 +82,7 @@ EOF /tools/etc/inittab. If your system only has a serial console skip the following command: -cat >> /tools/etc/inittab << "EOF" +cat >> ${CLFS}/tools/etc/inittab << "EOF" 1:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty1 9600 2:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty2 9600 3:2345:respawn:/tools/sbin/agetty --noclear -I '\033(K' tty3 9600 @@ -95,14 +95,14 @@ EOF If your system has a serial console, run the following command to add the entry to /tools/etc/inittab. -cat >> /tools/etc/inittab << "EOF" +cat >> ${CLFS}/tools/etc/inittab << "EOF" c0:12345:respawn:/tools/sbin/agetty --noclear 115200 ttyS0 vt100 EOF Finally, add the end line to /tools/etc/inittab. -cat >> /tools/etc/inittab << "EOF" +cat >> ${CLFS}/tools/etc/inittab << "EOF" # End /tools/etc/inittab EOF diff --git a/BOOK/boot/mips/colo-build.xml b/BOOK/boot/mips/colo-build.xml index 93fd18b..b8f951f 100644 --- a/BOOK/boot/mips/colo-build.xml +++ b/BOOK/boot/mips/colo-build.xml @@ -54,8 +54,8 @@ make CROSS_COMPILE="${CLFS_TARGET}-" binary href="../../final-system/mips/colo.xml" xpointer="xpointer(//*[@os='c'])"/> -cp -v chain/colo-chain.elf /tools/boot/vmlinux -gzip -9 /tools/boot/vmlinux +cp -v chain/colo-chain.elf ${CLFS}/tools/boot/vmlinux +gzip -9 ${CLFS}/tools/boot/vmlinux diff --git a/BOOK/boot/mips/kernel.xml b/BOOK/boot/mips/kernel.xml index dcf0f36..ac2425f 100644 --- a/BOOK/boot/mips/kernel.xml +++ b/BOOK/boot/mips/kernel.xml @@ -71,14 +71,14 @@ xpointer="xpointer(//*[@os='s'])"/> make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools modules_install + INSTALL_MOD_PATH=${CLFS}/tools modules_install make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools firmware_install + INSTALL_MOD_PATH=${CLFS}/tools firmware_install -mkdir -pv /tools/boot -cp -v vmlinux /tools/boot/vmlinux-&linux-version; -gzip -9 /tools/boot/vmlinux-&linux-version; +mkdir -pv ${CLFS}/tools/boot +cp -v vmlinux ${CLFS}/tools/boot/vmlinux-&linux-version; +gzip -9 ${CLFS}/tools/boot/vmlinux-&linux-version; make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools modules_install + INSTALL_MOD_PATH=${CLFS}/tools modules_install make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools firmware_install + INSTALL_MOD_PATH=${CLFS}/tools firmware_install -mkdir -pv /tools/boot -cp -v vmlinux /tools/boot/vmlinux-&linux-version; -gzip -9 /tools/boot/vmlinux-&linux-version; +mkdir -pv ${CLFS}/tools/boot +cp -v vmlinux ${CLFS}/tools/boot/vmlinux-&linux-version; +gzip -9 ${CLFS}/tools/boot/vmlinux-&linux-version; make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools modules_install + INSTALL_MOD_PATH=${CLFS}/tools modules_install make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools firmware_install + INSTALL_MOD_PATH=${CLFS}/tools firmware_install -mkdir -pv /tools/boot -cp -v vmlinux /tools/boot/clfskernel-&linux-version; +mkdir -pv ${CLFS}/tools/boot +cp -v vmlinux ${CLFS}/tools/boot/clfskernel-&linux-version; Install the e2fsck binary: -make install -C e2fsck +make DESTDIR=${CLFS} install -C e2fsck make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools modules_install + INSTALL_MOD_PATH=${CLFS}/tools modules_install make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools firmware_install + INSTALL_MOD_PATH=${CLFS}/tools firmware_install -mkdir -pv /tools/boot -cp -v vmlinux /tools/boot/clfskernel-&linux-version; +mkdir -pv ${CLFS}/tools/boot +cp -v vmlinux ${CLFS}/tools/boot/clfskernel-&linux-version; Install the package: -install -v -m 0755 -s elftoaout /cross-tools/bin +install -v -m 0755 -s elftoaout ${CLFS}/cross-tools/bin diff --git a/BOOK/boot/sparc/kernel.xml b/BOOK/boot/sparc/kernel.xml index 588f51a..1580b1b 100644 --- a/BOOK/boot/sparc/kernel.xml +++ b/BOOK/boot/sparc/kernel.xml @@ -71,14 +71,14 @@ xpointer="xpointer(//*[@os='s'])"/> make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools modules_install + INSTALL_MOD_PATH=${CLFS}/tools modules_install make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools firmware_install + INSTALL_MOD_PATH=${CLFS}/tools firmware_install -mkdir -pv /tools/boot -cp -v vmlinux /tools/boot/clfskernel-&linux-version; +mkdir -pv ${CLFS}/tools/boot +cp -v vmlinux ${CLFS}/tools/boot/clfskernel-&linux-version; -make ARCH=sparc64 INSTALL_MOD_PATH=/tools \ +make ARCH=sparc64 INSTALL_MOD_PATH=${CLFS}/tools \ CROSS_COMPILE=${CLFS_TARGET}- modules_install make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools firmware_install + INSTALL_MOD_PATH=${CLFS}/tools firmware_install -mkdir -pv /tools/boot -cp -v vmlinux /tools/boot/clfskernel-&linux-version; +mkdir -pv ${CLFS}/tools/boot +cp -v vmlinux ${CLFS}/tools/boot/clfskernel-&linux-version; make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools modules_install + INSTALL_MOD_PATH=${CLFS}/tools modules_install make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools firmware_install + INSTALL_MOD_PATH=${CLFS}/tools firmware_install After kernel compilation is complete, additional steps are required to complete the installation. Some files need to be copied to @@ -94,20 +94,20 @@ Issue the following commands to install the kernel: -mkdir -pv /tools/boot -cp -v arch/i386/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version; +mkdir -pv ${CLFS}/tools/boot +cp -v arch/i386/boot/bzImage ${CLFS}/tools/boot/vmlinuz-clfs-&linux-version; -cp -v System.map /tools/boot/System.map-&linux-version; +cp -v System.map ${CLFS}/tools/boot/System.map-&linux-version; -cp -v .config /tools/boot/config-&linux-version; +cp -v .config ${CLFS}/tools/boot/config-&linux-version; diff --git a/BOOK/boot/x86_64/kernel.xml b/BOOK/boot/x86_64/kernel.xml index 067c126..5693af7 100644 --- a/BOOK/boot/x86_64/kernel.xml +++ b/BOOK/boot/x86_64/kernel.xml @@ -75,14 +75,14 @@ xpointer="xpointer(//*[@os='s'])"/> make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools modules_install + INSTALL_MOD_PATH=${CLFS}/tools modules_install make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \ - INSTALL_MOD_PATH=/tools firmware_install + INSTALL_MOD_PATH=${CLFS}/tools firmware_install -mkdir -pv /tools/boot -cp -v arch/x86_64/boot/bzImage /tools/boot/vmlinuz-clfs-&linux-version; +mkdir -pv ${CLFS}/tools/boot +cp -v arch/x86_64/boot/bzImage ${CLFS}/tools/boot/vmlinuz-clfs-&linux-version; diff --git a/BOOK/cross-tools/common/bc.xml b/BOOK/cross-tools/common/bc.xml index c957f35..640a497 100644 --- a/BOOK/cross-tools/common/bc.xml +++ b/BOOK/cross-tools/common/bc.xml @@ -24,16 +24,16 @@ Prepare Bc for compilation: -./configure --prefix=/cross-tools +./configure --prefix=${CLFS}/cross-tools The meaning of the configure option: - --prefix=/cross-tools + --prefix=${CLFS}/cross-tools This tells the configure script to prepare to install the - package in the /cross-tools + package in the ${CLFS}/cross-tools directory. diff --git a/BOOK/cross-tools/common/binutils-32.xml b/BOOK/cross-tools/common/binutils-32.xml index 1455c8f..fde95e5 100644 --- a/BOOK/cross-tools/common/binutils-32.xml +++ b/BOOK/cross-tools/common/binutils-32.xml @@ -49,7 +49,7 @@ xpointer="xpointer(//*[@os='i'])"/> AR=ar AS=as ../binutils-&binutils-dir;/configure \ - --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ + --prefix=${CLFS}/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \ --disable-static --disable-multilib diff --git a/BOOK/cross-tools/common/binutils.xml b/BOOK/cross-tools/common/binutils.xml index d9e62af..82c71de 100644 --- a/BOOK/cross-tools/common/binutils.xml +++ b/BOOK/cross-tools/common/binutils.xml @@ -49,7 +49,7 @@ xpointer="xpointer(//*[@os='i'])"/> AR=ar AS=as ../binutils-&binutils-dir;/configure \ - --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ + --prefix=${CLFS}/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \ --disable-static --enable-64-bit-bfd --disable-multilib diff --git a/BOOK/cross-tools/common/cloog.xml b/BOOK/cross-tools/common/cloog.xml index 75810c0..3552c43 100644 --- a/BOOK/cross-tools/common/cloog.xml +++ b/BOOK/cross-tools/common/cloog.xml @@ -24,9 +24,9 @@ Prepare CLooG for compilation: -LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ - ./configure --prefix=/cross-tools --disable-static \ - --with-gmp-prefix=/cross-tools --with-isl-prefix=/cross-tools +LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ + ./configure --prefix=${CLFS}/cross-tools --disable-static \ + --with-gmp-prefix=${CLFS}/cross-tools --with-isl-prefix=${CLFS}/cross-tools Prepare File for compilation: -./configure --prefix=/cross-tools --disable-static +./configure --prefix=${CLFS}/cross-tools --disable-static The meaning of the new configure option: diff --git a/BOOK/cross-tools/common/gcc-final.xml b/BOOK/cross-tools/common/gcc-final.xml index 2acd30f..3e03d63 100644 --- a/BOOK/cross-tools/common/gcc-final.xml +++ b/BOOK/cross-tools/common/gcc-final.xml @@ -58,16 +58,16 @@ href="gcc-static.xml" xpointer="xpointer(//*[@os='h'])"/> -AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ - ../gcc-&gcc-version;/configure --prefix=/cross-tools \ +AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ + ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \ --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \ --with-sysroot=${CLFS} --with-local-prefix=/tools \ --with-native-system-header-dir=/tools/include --disable-nls \ --enable-shared --disable-static --enable-languages=c,c++ \ --enable-__cxa_atexit --enable-c99 \ --enable-long-long --enable-threads=posix --disable-multilib \ - --with-mpc=/cross-tools --with-mpfr=/cross-tools --with-gmp=/cross-tools \ - --with-cloog=/cross-tools --with-isl=/cross-tools --with-system-zlib \ + --with-mpc=${CLFS}/cross-tools --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \ + --with-cloog=${CLFS}/cross-tools --with-isl=${CLFS}/cross-tools --with-system-zlib \ --enable-checking=release --enable-libstdcxx-time diff --git a/BOOK/cross-tools/common/gcc-static.xml b/BOOK/cross-tools/common/gcc-static.xml index dd81822..e1d2e9a 100644 --- a/BOOK/cross-tools/common/gcc-static.xml +++ b/BOOK/cross-tools/common/gcc-static.xml @@ -46,7 +46,7 @@ echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFI We will create a dummy limits.h so the build will not use the one provided by the host distro: -touch /tools/include/limits.h +touch ${CLFS}/tools/include/limits.h -AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ - ../gcc-&gcc-version;/configure --prefix=/cross-tools \ +AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ + ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \ --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \ --with-sysroot=${CLFS} --with-local-prefix=/tools \ --with-native-system-header-dir=/tools/include --disable-nls \ - --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \ - --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \ + --disable-shared --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \ + --with-isl=${CLFS}/cross-tools --with-cloog=${CLFS}/cross-tools --with-mpc=${CLFS}/cross-tools \ --without-headers --with-newlib --disable-decimal-float --disable-libgomp \ --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \ --disable-libsanitizer --disable-libquadmath --disable-threads \ @@ -197,7 +197,7 @@ echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFI Copy libiberty.h to /tools/include directory: -cp -v ../gcc-&gcc-version;/include/libiberty.h /tools/include +cp -v ../gcc-&gcc-version;/include/libiberty.h ${CLFS}/tools/include diff --git a/BOOK/cross-tools/common/glibc.xml b/BOOK/cross-tools/common/glibc.xml index d25feda..dad2ecc 100644 --- a/BOOK/cross-tools/common/glibc.xml +++ b/BOOK/cross-tools/common/glibc.xml @@ -55,8 +55,8 @@ sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile @@ -126,7 +126,7 @@ sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile - --with-binutils=/cross-tools/bin + --with-binutils=${CLFS}/cross-tools/bin This tells Glibc to use the Binutils that are specific to our target architecture. @@ -134,7 +134,7 @@ sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/Makefile - --with-headers=/tools/include + --with-headers=${CLFS}/tools/include This tells Glibc to compile itself against the headers recently installed to the /tools @@ -178,7 +178,7 @@ sed 's/\\$$(pwd)/`pwd`/' timezone/Makefile.orig > timezone/MakefileInstall the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/cross-tools/common/gmp.xml b/BOOK/cross-tools/common/gmp.xml index 7770774..be11bea 100644 --- a/BOOK/cross-tools/common/gmp.xml +++ b/BOOK/cross-tools/common/gmp.xml @@ -41,7 +41,7 @@ Prepare GMP for compilation: -./configure --prefix=/cross-tools --enable-cxx \ +./configure --prefix=${CLFS}/cross-tools --enable-cxx \ --disable-static diff --git a/BOOK/cross-tools/common/isl.xml b/BOOK/cross-tools/common/isl.xml index 509695b..8f592c3 100644 --- a/BOOK/cross-tools/common/isl.xml +++ b/BOOK/cross-tools/common/isl.xml @@ -24,9 +24,9 @@ Prepare ISL for compilation: -LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ -./configure --prefix=/cross-tools --disable-static \ - --with-gmp-prefix=/cross-tools +LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ +./configure --prefix=${CLFS}/cross-tools --disable-static \ + --with-gmp-prefix=${CLFS}/cross-tools Compile the package: diff --git a/BOOK/cross-tools/common/m4.xml b/BOOK/cross-tools/common/m4.xml index f8d87d5..a1ae858 100644 --- a/BOOK/cross-tools/common/m4.xml +++ b/BOOK/cross-tools/common/m4.xml @@ -24,7 +24,7 @@ Prepare M4 for compilation: -./configure --prefix=/cross-tools +./configure --prefix=${CLFS}/cross-tools Compile the package: diff --git a/BOOK/cross-tools/common/mpc.xml b/BOOK/cross-tools/common/mpc.xml index 4e632c1..bb3319a 100644 --- a/BOOK/cross-tools/common/mpc.xml +++ b/BOOK/cross-tools/common/mpc.xml @@ -24,9 +24,9 @@ Prepare MPC for compilation: -LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ -./configure --prefix=/cross-tools --disable-static \ - --with-gmp=/cross-tools --with-mpfr=/cross-tools +LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ +./configure --prefix=${CLFS}/cross-tools --disable-static \ + --with-gmp=${CLFS}/cross-tools --with-mpfr=${CLFS}/cross-tools Compile the package: diff --git a/BOOK/cross-tools/common/mpfr.xml b/BOOK/cross-tools/common/mpfr.xml index 21f7115..5448ef5 100644 --- a/BOOK/cross-tools/common/mpfr.xml +++ b/BOOK/cross-tools/common/mpfr.xml @@ -32,23 +32,23 @@ Prepare MPFR for compilation: -LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ -./configure --prefix=/cross-tools \ - --disable-static --with-gmp=/cross-tools +LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ +./configure --prefix=${CLFS}/cross-tools \ + --disable-static --with-gmp=${CLFS}/cross-tools The meaning of the new configure options: - LDFLAGS="-Wl,-rpath,/cross-tools/lib" + LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" This tells configure to search in - /cross-tools for libraries. + ${CLFS}/cross-tools for libraries. - --with-gmp=/cross-tools + --with-gmp=${CLFS}/cross-tools This tells configure where to find GMP. diff --git a/BOOK/cross-tools/common/ncurses.xml b/BOOK/cross-tools/common/ncurses.xml index 048979f..e63d0fc 100644 --- a/BOOK/cross-tools/common/ncurses.xml +++ b/BOOK/cross-tools/common/ncurses.xml @@ -32,7 +32,7 @@ Prepare Ncurses for compilation: -./configure --prefix=/cross-tools \ +./configure --prefix=${CLFS}/cross-tools \ --without-debug --without-shared @@ -63,7 +63,7 @@ make -C progs tic Install tic with the following command: -install -v -m755 progs/tic /cross-tools/bin +install -v -m755 progs/tic ${CLFS}/cross-tools/bin diff --git a/BOOK/cross-tools/mips/linux-headers.xml b/BOOK/cross-tools/mips/linux-headers.xml index 1f93d99..bb4e4fb 100644 --- a/BOOK/cross-tools/mips/linux-headers.xml +++ b/BOOK/cross-tools/mips/linux-headers.xml @@ -32,7 +32,7 @@ make mrproper make ARCH=mips headers_check -make ARCH=mips INSTALL_HDR_PATH=/tools headers_install +make ARCH=mips INSTALL_HDR_PATH=${CLFS}/tools headers_install The meaning of the make commands: @@ -50,10 +50,10 @@ make ARCH=mips INSTALL_HDR_PATH=/tools headers_install - make ARCH=mips INSTALL_HDR_PATH=/tools headers_install + make ARCH=mips INSTALL_HDR_PATH=${CLFS}/tools headers_install This will install the kernel headers into - /tools/include. + ${CLFS}/tools/include. 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/BOOK/cross-tools/mips64-64/gcc-final.xml +++ b/BOOK/cross-tools/mips64-64/gcc-final.xml @@ -58,16 +58,16 @@ href="gcc-static.xml" xpointer="xpointer(//*[@os='h'])"/> -AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ - ../gcc-4.8.2/configure --prefix=/cross-tools \ +AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ + ../gcc-4.8.2/configure --prefix=${CLFS}/cross-tools \ --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \ --with-sysroot=${CLFS} --with-local-prefix=/tools \ --with-native-system-header-dir=/tools/include --disable-nls \ --enable-shared --disable-static --enable-languages=c,c++ \ --enable-__cxa_atexit --enable-c99 --enable-long-long --enable-threads=posix \ - --disable-multilib --with-mpc=/cross-tools --with-mpfr=/cross-tools \ - --with-gmp=/cross-tools --with-cloog=/cross-tools \ - --with-isl=/cross-tools --with-system-zlib --enable-checking=release \ + --disable-multilib --with-mpc=${CLFS}/cross-tools --with-mpfr=${CLFS}/cross-tools \ + --with-gmp=${CLFS}/cross-tools --with-cloog=${CLFS}/cross-tools \ + --with-isl=${CLFS}/cross-tools --with-system-zlib --enable-checking=release \ --enable-libstdcxx-time --with-abi=64 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/BOOK/cross-tools/mips64-64/gcc-static.xml +++ b/BOOK/cross-tools/mips64-64/gcc-static.xml @@ -67,13 +67,13 @@ href="../../final-system/common/gcc.xml" xpointer="xpointer(//*[@os='h'])"/> -AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ - ../gcc-&gcc-version;/configure --prefix=/cross-tools \ +AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ + ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \ --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \ --with-sysroot=${CLFS} --with-local-prefix=/tools \ --with-native-system-header-dir=/tools/include --disable-nls \ - --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \ - --with-isl=/cross-tools --with-cloog=/cross-tools --with-mpc=/cross-tools \ + --disable-shared --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \ + --with-isl=${CLFS}/cross-tools --with-cloog=${CLFS}/cross-tools --with-mpc=${CLFS}/cross-tools \ --without-headers --with-newlib --disable-decimal-float --disable-libgomp \ --disable-libmudflap --disable-libssp --disable-libatomic --disable-libitm \ --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/BOOK/cross-tools/mips64/glibc-n32.xml +++ b/BOOK/cross-tools/mips64/glibc-n32.xml @@ -64,7 +64,7 @@ ../glibc-&glibc-version;/configure --prefix=/tools \ --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib32 \ --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \ - --with-binutils=/cross-tools/bin --with-headers=/tools/include \ + --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/tools/include \ --enable-obsolete-rpc --cache-file=config.cache diff --git a/BOOK/cross-tools/multilib/binutils.xml b/BOOK/cross-tools/multilib/binutils.xml index 9a0fdf4..999508d 100644 --- a/BOOK/cross-tools/multilib/binutils.xml +++ b/BOOK/cross-tools/multilib/binutils.xml @@ -48,7 +48,7 @@ xpointer="xpointer(//*[@os='i'])"/> AR=ar AS=as ../binutils-&binutils-dir;/configure \ - --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ + --prefix=${CLFS}/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \ --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \ --disable-nls --disable-static --enable-64-bit-bfd diff --git a/BOOK/cross-tools/multilib/gcc-final.xml b/BOOK/cross-tools/multilib/gcc-final.xml index a562784..3920683 100644 --- a/BOOK/cross-tools/multilib/gcc-final.xml +++ b/BOOK/cross-tools/multilib/gcc-final.xml @@ -58,16 +58,16 @@ href="gcc-static.xml" xpointer="xpointer(//*[@os='h'])"/> -AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ - ../gcc-&gcc-version;/configure --prefix=/cross-tools \ +AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ + ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \ --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \ --with-sysroot=${CLFS} --with-local-prefix=/tools \ --with-native-system-header-dir=/tools/include \ --disable-nls --enable-shared --disable-static \ --enable-languages=c,c++ --enable-__cxa_atexit --enable-c99 \ - --enable-long-long --enable-threads=posix --with-mpc=/cross-tools \ - --with-mpfr=/cross-tools --with-gmp=/cross-tools --with-cloog=/cross-tools \ - --with-isl=/cross-tools --with-system-zlib --enable-checking=release \ + --enable-long-long --enable-threads=posix --with-mpc=${CLFS}/cross-tools \ + --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools --with-cloog=${CLFS}/cross-tools \ + --with-isl=${CLFS}/cross-tools --with-system-zlib --enable-checking=release \ --enable-libstdcxx-time -AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \ - ../gcc-&gcc-version;/configure --prefix=/cross-tools \ +AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \ + ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \ --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \ --with-sysroot=${CLFS} --with-local-prefix=/tools \ --with-native-system-header-dir=/tools/include --disable-nls \ - --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \ - --with-cloog=/cross-tools --with-mpc=/cross-tools --without-headers \ + --disable-shared --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \ + --with-cloog=${CLFS}/cross-tools --with-mpc=${CLFS}/cross-tools --without-headers \ --with-newlib --disable-decimal-float --disable-libgomp --disable-libmudflap \ --disable-libssp --disable-libatomic --disable-libitm \ --disable-libsanitizer --disable-libquadmath --disable-threads \ - --disable-target-zlib --with-system-zlib --with-isl=/cross-tools \ + --disable-target-zlib --with-system-zlib --with-isl=${CLFS}/cross-tools \ --enable-languages=c --enable-checking=release diff --git a/BOOK/cross-tools/multilib/glibc.xml b/BOOK/cross-tools/multilib/glibc.xml index d67fbc1..74ef9fa 100644 --- a/BOOK/cross-tools/multilib/glibc.xml +++ b/BOOK/cross-tools/multilib/glibc.xml @@ -59,7 +59,7 @@ ../glibc-&glibc-version;/configure --prefix=/tools \ --host=${CLFS_TARGET32} --build=${CLFS_HOST} \ --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \ - --with-binutils=/cross-tools/bin --with-headers=/tools/include \ + --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/tools/include \ --enable-obsolete-rpc --cache-file=config.cache diff --git a/BOOK/cross-tools/ppc/linux-headers.xml b/BOOK/cross-tools/ppc/linux-headers.xml index 849482d..6251a4f 100644 --- a/BOOK/cross-tools/ppc/linux-headers.xml +++ b/BOOK/cross-tools/ppc/linux-headers.xml @@ -32,7 +32,7 @@ make mrproper make ARCH=powerpc headers_check -make ARCH=powerpc INSTALL_HDR_PATH=/tools headers_install +make ARCH=powerpc INSTALL_HDR_PATH=${CLFS}/tools headers_install The meaning of the make commands: @@ -50,10 +50,10 @@ make ARCH=powerpc INSTALL_HDR_PATH=/tools headers_install - make ARCH=powerpc INSTALL_HDR_PATH=/tools headers_install + make ARCH=powerpc INSTALL_HDR_PATH=${CLFS}/tools headers_install This will install the kernel headers into - /tools/include. + ${CLFS}/tools/include. diff --git a/BOOK/cross-tools/sparc/linux-headers.xml b/BOOK/cross-tools/sparc/linux-headers.xml index 23ad793..6febf76 100644 --- a/BOOK/cross-tools/sparc/linux-headers.xml +++ b/BOOK/cross-tools/sparc/linux-headers.xml @@ -32,7 +32,7 @@ make mrproper make ARCH=sparc headers_check -make ARCH=sparc INSTALL_HDR_PATH=/tools headers_install +make ARCH=sparc INSTALL_HDR_PATH=${CLFS}/tools headers_install The meaning of the make commands: @@ -50,10 +50,10 @@ make ARCH=sparc INSTALL_HDR_PATH=/tools headers_install - make ARCH=sparc INSTALL_HDR_PATH=/tools headers_install + make ARCH=sparc INSTALL_HDR_PATH=${CLFS}/tools headers_install This will install the kernel headers into - /tools/include. + ${CLFS}/tools/include. diff --git a/BOOK/cross-tools/sparc64/linux-headers.xml b/BOOK/cross-tools/sparc64/linux-headers.xml index a61757f..d9b6bab 100644 --- a/BOOK/cross-tools/sparc64/linux-headers.xml +++ b/BOOK/cross-tools/sparc64/linux-headers.xml @@ -32,7 +32,7 @@ make mrproper make ARCH=sparc64 headers_check -make ARCH=sparc64 INSTALL_HDR_PATH=/tools headers_install +make ARCH=sparc64 INSTALL_HDR_PATH=${CLFS}/tools headers_install The meaning of the make commands: @@ -50,10 +50,10 @@ make ARCH=sparc64 INSTALL_HDR_PATH=/tools headers_install - make ARCH=sparc64 INSTALL_HDR_PATH=/tools headers_install + make ARCH=sparc64 INSTALL_HDR_PATH=${CLFS}/tools headers_install This will install the kernel headers into - /tools/include. + ${CLFS}/tools/include. diff --git a/BOOK/cross-tools/x86/linux-headers.xml b/BOOK/cross-tools/x86/linux-headers.xml index 7db269a..e928736 100644 --- a/BOOK/cross-tools/x86/linux-headers.xml +++ b/BOOK/cross-tools/x86/linux-headers.xml @@ -32,7 +32,7 @@ make mrproper make ARCH=i386 headers_check -make ARCH=i386 INSTALL_HDR_PATH=/tools headers_install +make ARCH=i386 INSTALL_HDR_PATH=${CLFS}/tools headers_install The meaning of the make commands: @@ -50,10 +50,10 @@ make ARCH=i386 INSTALL_HDR_PATH=/tools headers_install - make ARCH=i386 INSTALL_HDR_PATH=/tools headers_install + make ARCH=i386 INSTALL_HDR_PATH=${CLFS}/tools headers_install This will install the kernel headers into - /tools/include. + ${CLFS}/tools/include. 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/BOOK/cross-tools/x86_64/linux-headers.xml +++ b/BOOK/cross-tools/x86_64/linux-headers.xml @@ -32,7 +32,7 @@ make mrproper make ARCH=x86_64 headers_check -make ARCH=x86_64 INSTALL_HDR_PATH=/tools headers_install +make ARCH=x86_64 INSTALL_HDR_PATH=${CLFS}/tools headers_install The meaning of the make commands: @@ -50,10 +50,10 @@ make ARCH=x86_64 INSTALL_HDR_PATH=/tools headers_install - make ARCH=x86_64 INSTALL_HDR_PATH=/tools headers_install + make ARCH=x86_64 INSTALL_HDR_PATH=${CLFS}/tools headers_install This will install the kernel headers into - /tools/include. + ${CLFS}/tools/include. diff --git a/BOOK/final-preps/creatingcrossdir.xml b/BOOK/final-preps/creatingcrossdir.xml index f0fdc2a..dcb638f 100644 --- a/BOOK/final-preps/creatingcrossdir.xml +++ b/BOOK/final-preps/creatingcrossdir.xml @@ -23,11 +23,4 @@ install -dv ${CLFS}/cross-tools - The next step is to create a /cross-tools symlink on the host system. - This will point to the newly-created directory on the CLFS partition. - Run this command as root as well: - -ln -sv ${CLFS}/cross-tools / - diff --git a/BOOK/final-preps/creatingtoolsdir.xml b/BOOK/final-preps/creatingtoolsdir.xml index ec27f39..1c93d50 100644 --- a/BOOK/final-preps/creatingtoolsdir.xml +++ b/BOOK/final-preps/creatingtoolsdir.xml @@ -25,13 +25,6 @@ install -dv ${CLFS}/tools - The next step is to create a /tools - symlink on the host system. This will point to the newly-created directory - on the CLFS partition. Run this command as root as well: - -ln -sv ${CLFS}/tools / - The above command is correct. The ln command has a few syntactic variations, so be sure to check info @@ -39,9 +32,4 @@ what you may think is an error. - The created symlink enables the toolchain to be compiled so that - it always refers to /tools, - meaning that the compiler, assembler, and linker will work. This will - provide a common place for our temporary tools system. - diff --git a/BOOK/final-preps/settingenviron.xml b/BOOK/final-preps/settingenviron.xml index 0b82f75..3ae42b5 100644 --- a/BOOK/final-preps/settingenviron.xml +++ b/BOOK/final-preps/settingenviron.xml @@ -43,7 +43,7 @@ EOF umask 022 CLFS=/mnt/clfs LC_ALL=POSIX -PATH=/cross-tools/bin:/bin:/usr/bin +PATH=${CLFS}/cross-tools/bin:/bin:/usr/bin export CLFS LC_ALL PATH EOF @@ -55,7 +55,7 @@ EOF be used as soon as they are installed. By switching off the hash function, the shell will always search the PATH when a program is to be run. As such, the shell will find the newly compiled tools in - /cross-tools as soon as they are + ${CLFS}/cross-tools as soon as they are available without remembering a previous version of the same program in a different location. @@ -78,7 +78,7 @@ EOF (the two are equivalent) ensures that everything will work as expected in the chroot environment. - By putting /cross-tools/bin + By putting ${CLFS}/cross-tools/bin at the beginning of the PATH, the cross-compiler built in will be picked up by 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/BOOK/temp-system/64/gcc.xml +++ b/BOOK/temp-system/64/gcc.xml @@ -76,7 +76,7 @@ --with-local-prefix=/tools --enable-long-long --enable-c99 --enable-shared \ --enable-threads=posix --disable-nls --enable-__cxa_atexit \ --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \ - --with-native-system-header-dir=/tools/include --enable-checking=release \ + --with-native-system-header-dir=${CLFS}/tools/include --enable-checking=release \ --enable-libstdcxx-time diff --git a/BOOK/temp-system/64/mpc.xml b/BOOK/temp-system/64/mpc.xml index 8b93910..17d10af 100644 --- a/BOOK/temp-system/64/mpc.xml +++ b/BOOK/temp-system/64/mpc.xml @@ -27,7 +27,7 @@ xpointer="xpointer(//*[@os='a'])"/> CC="${CC} ${BUILD64}" \ - ./configure --prefix=/tools \ + ./configure --prefix=/tools --with-sysroot \ --build=${CLFS_HOST} --host=${CLFS_TARGET} CC="${CC} ${BUILD64}" ./configure --prefix=/tools \ --build=${CLFS_HOST} --host=${CLFS_TARGET} \ - --enable-shared + --enable-shared --with-sysroot + + + + 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/BOOK/temp-system/common/bash.xml +++ b/BOOK/temp-system/common/bash.xml @@ -88,7 +88,7 @@ EOF href="../../final-system/common/bash.xml" xpointer="xpointer(//*[@os='g'])"/> -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/binutils.xml b/BOOK/temp-system/common/binutils.xml index ec1dd0f..eafdb95 100644 --- a/BOOK/temp-system/common/binutils.xml +++ b/BOOK/temp-system/common/binutils.xml @@ -61,9 +61,7 @@ href="../../cross-tools/common/binutils.xml" xpointer="xpointer(//*[@os='bh'])"/> - +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/bzip2.xml b/BOOK/temp-system/common/bzip2.xml index bdd49a8..d5fc790 100644 --- a/BOOK/temp-system/common/bzip2.xml +++ b/BOOK/temp-system/common/bzip2.xml @@ -37,7 +37,7 @@ sed -e 's@^\(all:.*\) test@\1@g' Makefile.orig > MakefileInstall the package: -make PREFIX=/tools install +make PREFIX=${CLFS}/tools install diff --git a/BOOK/temp-system/common/check.xml b/BOOK/temp-system/common/check.xml index ef36a19..5ece3d5 100644 --- a/BOOK/temp-system/common/check.xml +++ b/BOOK/temp-system/common/check.xml @@ -49,7 +49,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/cloog.xml b/BOOK/temp-system/common/cloog.xml index d266518..74a9cde 100644 --- a/BOOK/temp-system/common/cloog.xml +++ b/BOOK/temp-system/common/cloog.xml @@ -41,7 +41,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/coreutils.xml b/BOOK/temp-system/common/coreutils.xml index 5b29524..53f109c 100644 --- a/BOOK/temp-system/common/coreutils.xml +++ b/BOOK/temp-system/common/coreutils.xml @@ -61,7 +61,7 @@ EOF Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/diffutils.xml b/BOOK/temp-system/common/diffutils.xml index 0fdafee..f72223b 100644 --- a/BOOK/temp-system/common/diffutils.xml +++ b/BOOK/temp-system/common/diffutils.xml @@ -33,7 +33,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/file.xml b/BOOK/temp-system/common/file.xml index fbe6d70..b1b1fab 100644 --- a/BOOK/temp-system/common/file.xml +++ b/BOOK/temp-system/common/file.xml @@ -33,7 +33,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/findutils.xml b/BOOK/temp-system/common/findutils.xml index 24969b5..e3d82b6 100644 --- a/BOOK/temp-system/common/findutils.xml +++ b/BOOK/temp-system/common/findutils.xml @@ -48,9 +48,7 @@ echo "ac_cv_func_fnmatch_gnu=yes" >> config.cache href="../../final-system/common/findutils.xml" xpointer="xpointer(//*[@os='g'])"/> - +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/gawk.xml b/BOOK/temp-system/common/gawk.xml index 9a62dfe..e15297a 100644 --- a/BOOK/temp-system/common/gawk.xml +++ b/BOOK/temp-system/common/gawk.xml @@ -33,7 +33,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/gcc.xml b/BOOK/temp-system/common/gcc.xml index 6e02cab..1ba2540 100644 --- a/BOOK/temp-system/common/gcc.xml +++ b/BOOK/temp-system/common/gcc.xml @@ -74,7 +74,7 @@ --with-local-prefix=/tools --enable-long-long --enable-c99 --enable-shared \ --enable-threads=posix --disable-multilib --disable-nls \ --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \ - --with-system-zlib --with-native-system-header-dir=/tools/include \ + --with-system-zlib --with-native-system-header-dir=${CLFS}/tools/include \ --disable-libssp --enable-checking=release --enable-libstdcxx-time @@ -105,7 +105,7 @@ sed "/^HOST_\(GMP\|ISL\|CLOOG\)\(LIBS\|INC\)/s:/tools:/cross-tools:g" \ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/gettext.xml b/BOOK/temp-system/common/gettext.xml index 22f876e..6c7d8bb 100644 --- a/BOOK/temp-system/common/gettext.xml +++ b/BOOK/temp-system/common/gettext.xml @@ -49,7 +49,7 @@ make -C src msgfmt msgmerge xgettext Install the msgfmt, msgmerge and xgettext binaries: -cp -v src/{msgfmt,msgmerge,xgettext} /tools/bin +cp -v src/{msgfmt,msgmerge,xgettext} ${CLFS}/tools/bin diff --git a/BOOK/temp-system/common/gmp.xml b/BOOK/temp-system/common/gmp.xml index fea731b..dcd8eae 100644 --- a/BOOK/temp-system/common/gmp.xml +++ b/BOOK/temp-system/common/gmp.xml @@ -44,7 +44,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/grep.xml b/BOOK/temp-system/common/grep.xml index f5918c3..4757a71 100644 --- a/BOOK/temp-system/common/grep.xml +++ b/BOOK/temp-system/common/grep.xml @@ -57,9 +57,7 @@ href="../../final-system/common/grep.xml" xpointer="xpointer(//*[@os='f'])"/> - +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/gzip.xml b/BOOK/temp-system/common/gzip.xml index cc8e846..03e9cc6 100644 --- a/BOOK/temp-system/common/gzip.xml +++ b/BOOK/temp-system/common/gzip.xml @@ -41,9 +41,7 @@ href="../../final-system/common/gzip.xml" xpointer="xpointer(//*[@os='f'])"/> - +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/isl.xml b/BOOK/temp-system/common/isl.xml index 7d1c2de..00b3365 100644 --- a/BOOK/temp-system/common/isl.xml +++ b/BOOK/temp-system/common/isl.xml @@ -33,7 +33,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/m4.xml b/BOOK/temp-system/common/m4.xml index 67a87b6..3928e08 100644 --- a/BOOK/temp-system/common/m4.xml +++ b/BOOK/temp-system/common/m4.xml @@ -49,7 +49,7 @@ EOF Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/make.xml b/BOOK/temp-system/common/make.xml index 3a71d35..a07df5e 100644 --- a/BOOK/temp-system/common/make.xml +++ b/BOOK/temp-system/common/make.xml @@ -41,9 +41,7 @@ href="../../final-system/common/make.xml" xpointer="xpointer(//*[@os='f'])"/> - +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/mpc.xml b/BOOK/temp-system/common/mpc.xml index 41c3c1d..9b86139 100644 --- a/BOOK/temp-system/common/mpc.xml +++ b/BOOK/temp-system/common/mpc.xml @@ -24,7 +24,7 @@ Prepare MPC for compilation: -./configure --prefix=/tools \ +./configure --prefix=/tools --with-sysroot \ --build=${CLFS_HOST} --host=${CLFS_TARGET} Compile the package: @@ -33,7 +33,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/mpfr.xml b/BOOK/temp-system/common/mpfr.xml index 2c6ea76..983a385 100644 --- a/BOOK/temp-system/common/mpfr.xml +++ b/BOOK/temp-system/common/mpfr.xml @@ -34,7 +34,7 @@ ./configure --prefix=/tools \ --build=${CLFS_HOST} --host=${CLFS_TARGET} \ - --enable-shared + --enable-shared --with-sysroot Compile the package: @@ -42,7 +42,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/ncurses.xml b/BOOK/temp-system/common/ncurses.xml index 70543a7..1f13e2e 100644 --- a/BOOK/temp-system/common/ncurses.xml +++ b/BOOK/temp-system/common/ncurses.xml @@ -94,9 +94,7 @@ href="../../final-system/common/ncurses.xml" xpointer="xpointer(//*[@os='f'])"/> - +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/patch.xml b/BOOK/temp-system/common/patch.xml index d2c2674..51e9699 100644 --- a/BOOK/temp-system/common/patch.xml +++ b/BOOK/temp-system/common/patch.xml @@ -33,7 +33,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/sed.xml b/BOOK/temp-system/common/sed.xml index 607b0a6..2ed446a 100644 --- a/BOOK/temp-system/common/sed.xml +++ b/BOOK/temp-system/common/sed.xml @@ -33,7 +33,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/tar.xml b/BOOK/temp-system/common/tar.xml index da72632..e5488cd 100644 --- a/BOOK/temp-system/common/tar.xml +++ b/BOOK/temp-system/common/tar.xml @@ -57,9 +57,7 @@ EOF href="../../final-system/common/tar.xml" xpointer="xpointer(//*[@os='f'])"/> - +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/texinfo.xml b/BOOK/temp-system/common/texinfo.xml index b4a62e3..be8adaf 100644 --- a/BOOK/temp-system/common/texinfo.xml +++ b/BOOK/temp-system/common/texinfo.xml @@ -54,9 +54,7 @@ href="../../final-system/common/texinfo.xml" xpointer="xpointer(//*[@os='f'])"/> - +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/util-linux.xml b/BOOK/temp-system/common/util-linux.xml index 6e6f78b..7e8e999 100644 --- a/BOOK/temp-system/common/util-linux.xml +++ b/BOOK/temp-system/common/util-linux.xml @@ -22,6 +22,11 @@ Installation of Util-linux + Allow librt to find libpthread: + +cp -v Makefile.in{,.orig} +sed 's/-lrt/& -lpthread/' Makefile.in.orig > Makefile.in + @@ -53,7 +58,7 @@ href="../../final-system/common/util-linux.xml" xpointer="xpointer(//*[@os='g'])"/> -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/vim.xml b/BOOK/temp-system/common/vim.xml index 72460c3..1dee497 100644 --- a/BOOK/temp-system/common/vim.xml +++ b/BOOK/temp-system/common/vim.xml @@ -106,18 +106,18 @@ EOF href="../../final-system/common/vim.xml" xpointer="xpointer(//*[@os='j'])"/> -make install +make DESTDIR=${CLFS} install -ln -sv vim /tools/bin/vi +ln -sv vim ${CLFS}/tools/bin/vi Create a temporary vimrc to make it function more the way you may expect it to. This is explained more in the final system: -cat > /tools/etc/vimrc << "EOF" +cat > ${CLFS}/tools/etc/vimrc << "EOF" " Begin /tools/etc/vimrc set nocompatible diff --git a/BOOK/temp-system/common/xz.xml b/BOOK/temp-system/common/xz.xml index 3fd8564..24baaed 100644 --- a/BOOK/temp-system/common/xz.xml +++ b/BOOK/temp-system/common/xz.xml @@ -39,7 +39,7 @@ Install the package: -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/common/zlib.xml b/BOOK/temp-system/common/zlib.xml index dc6224a..14e9316 100644 --- a/BOOK/temp-system/common/zlib.xml +++ b/BOOK/temp-system/common/zlib.xml @@ -40,7 +40,7 @@ href="../../final-system/common/zlib.xml" xpointer="xpointer(//*[@os='f'])"/> -make install +make DESTDIR=${CLFS} install diff --git a/BOOK/temp-system/mips64-64/gcc.xml b/BOOK/temp-system/mips64-64/gcc.xml index 89ba7e6..4e258b6 100644 --- a/BOOK/temp-system/mips64-64/gcc.xml +++ b/BOOK/temp-system/mips64-64/gcc.xml @@ -77,7 +77,7 @@ --enable-shared --enable-threads=posix --disable-nls --enable-__cxa_atexit \ --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \ --enable-checking=release --enable-libstdcxx-time \ - --with-native-system-header-dir=/tools/include + --with-native-system-header-dir=${CLFS}/tools/include The meaning of the new configure options: diff --git a/BOOK/temp-system/mips64/gcc.xml b/BOOK/temp-system/mips64/gcc.xml index d1192ad..995b202 100644 --- a/BOOK/temp-system/mips64/gcc.xml +++ b/BOOK/temp-system/mips64/gcc.xml @@ -78,7 +78,7 @@ --enable-__cxa_atexit --disable-nls --enable-languages=c,c++ \ --disable-libstdcxx-pch --with-abi=64 --with-system-zlib \ --enable-checking=release --enable-libstdcxx-time \ - --with-native-system-header-dir=/tools/include + --with-native-system-header-dir=${CLFS}/tools/include diff --git a/BOOK/temp-system/multilib/make.xml b/BOOK/temp-system/multilib/make.xml index 7aff7ce..9e5be6e 100644 --- a/BOOK/temp-system/multilib/make.xml +++ b/BOOK/temp-system/multilib/make.xml @@ -42,7 +42,7 @@ xpointer="xpointer(//*[@os='f'])"/> diff --git a/BOOK/temp-system/multilib/mpc.xml b/BOOK/temp-system/multilib/mpc.xml index e874455..c51a2d8 100644 --- a/BOOK/temp-system/multilib/mpc.xml +++ b/BOOK/temp-system/multilib/mpc.xml @@ -27,7 +27,7 @@ xpointer="xpointer(//*[@os='a'])"/> CC="${CC} ${BUILD64}" \ - ./configure --prefix=/tools \ + ./configure --prefix=/tools --with-sysroot \ --build=${CLFS_HOST} --host=${CLFS_TARGET} \ --libdir=/tools/lib64 diff --git a/BOOK/temp-system/multilib/mpfr.xml b/BOOK/temp-system/multilib/mpfr.xml index 773469e..7a2da19 100644 --- a/BOOK/temp-system/multilib/mpfr.xml +++ b/BOOK/temp-system/multilib/mpfr.xml @@ -36,7 +36,7 @@ CC="${CC} ${BUILD64}" ./configure --prefix=/tools \ --build=${CLFS_HOST} --host=${CLFS_TARGET} \ - --libdir=/tools/lib64 --enable-shared + --libdir=/tools/lib64 --enable-shared --with-sysroot + + + + 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/BOOK/temp-system/ppc64-64/gcc.xml +++ b/BOOK/temp-system/ppc64-64/gcc.xml @@ -76,7 +76,7 @@ --with-local-prefix=/tools --enable-long-long --enable-c99 \ --enable-shared --enable-threads=posix --disable-nls --enable-__cxa_atexit \ --enable-languages=c,c++ --disable-libstdcxx-pch --with-system-zlib \ - --with-native-system-header-dir=/tools/include --enable-checking=release \ + --with-native-system-header-dir=${CLFS}/tools/include --enable-checking=release \ --enable-libstdcxx-time