Changeset bc2e3fa


Ignore:
Timestamp:
Dec 7, 2006, 11:23:24 PM (18 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
1e184e11
Parents:
8473983
Message:

Reverting of Sysroot Changes

Location:
BOOK
Files:
1 added
7 deleted
101 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/common/createfiles.xml

    r8473983 rbc2e3fa  
    1616  the next chapter after the software has been installed.</para>
    1717
    18 <screen><userinput>cd ${CLFS}/bin
    19 ln -sf ../tools/bin/{bash,cat,grep,pwd,rm,stty} .
    20 ln -sf bash sh
    21 cd ${CLFS}/usr/lib
    22 ln -sv ../../tools/lib/libgcc_s.so{,.1} .
    23 ln -sv ../../tools/lib/libstd*so* .</userinput></screen>
     18<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,rm,stty} ${CLFS}/bin
     19ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
     20ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
     21ln -sv bash ${CLFS}/bin/sh</userinput></screen>
    2422
    2523</sect1>

  • BOOK/boot/common/e2fsprogs.xml

    r8473983 rbc2e3fa  
    8282    xpointer="xpointer(//*[@os='k'])"/>
    8383
    84 <screen os="l"><userinput>make DESTDIR=${CLFS} install-libs</userinput></screen>
     84    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     85    href="../../final-system/common/e2fsprogs.xml"
     86    xpointer="xpointer(//*[@os='l'])"/>
    8587
    8688    <para os="ad">Create needed symlinks for a bootable system:</para>

  • BOOK/boot/common/module-init-tools.xml

    r8473983 rbc2e3fa  
    4242    xpointer="xpointer(//*[@os='j'])"/>
    4343
    44 <screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     44<screen os="k"><userinput>make DESTDIR="${CLFS}" install</userinput></screen>
    4545
    4646  </sect2>

  • BOOK/boot/common/sysvinit.xml

    r8473983 rbc2e3fa  
    3030    -e "s@/dev/initctl@${CLFS}&amp;@g" \
    3131    -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3@g' \
    32     -e "s@/usr/lib@${CLFS}/tools/lib@" \
     32    -e "s@/usr/lib@/tools/lib@" \
    3333    src/Makefile.orig > src/Makefile</userinput></screen>
    3434
    … …  
    4444    xpointer="xpointer(//*[@os='e'])"/>
    4545
    46 <screen os="ad"><userinput>make -C src install INSTALL=install ROOT=${CLFS}</userinput></screen>
     46<screen os="ad"><userinput>make -C src install INSTALL="install" ROOT="${CLFS}"</userinput></screen>
    4747
    4848  </sect2>

  • BOOK/boot/mips64/createfiles.xml

    r8473983 rbc2e3fa  
    1515  xpointer="xpointer(//*[@os='a'])"/>
    1616
    17 <screen><userinput>cd ${CLFS}/bin
    18 ln -sf ../tools/bin/{bash,cat,grep,pwd,rm,stty} .
    19 ln -sf bash sh
    20 cd ${CLFS}/usr/lib
    21 ln -sv ../../tools/lib/libgcc_s.so{,.1} .
    22 ln -sv ../../tools/lib/libstd*so* .
    23 cd ${CLFS}/usr/lib32
    24 ln -sv ../../tools/lib32/libgcc_s.so{,.1} .
    25 ln -sv ../../tools/lib32/libstd*so* .
    26 cd ${CLFS}/usr/lib64
    27 ln -sv ../../tools/lib64/libgcc_s.so{,.1} .
    28 ln -sv ../../tools/lib64/libstd*so* .</userinput></screen>
     17<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${CLFS}/bin
     18ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
     19ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
     20ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
     21ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
     22ln -sv /tools/lib32/libstd* ${CLFS}/usr/lib32
     23ln -sv /tools/lib64/libstd* ${CLFS}/usr/lib64
     24ln -sv bash ${CLFS}/bin/sh</userinput></screen>
    2925
    3026</sect1>

  • BOOK/boot/multilib/createfiles.xml

    r8473983 rbc2e3fa  
    1515  xpointer="xpointer(//*[@os='a'])"/>
    1616
    17 <screen><userinput>cd ${CLFS}/bin
    18 ln -sf ../tools/bin/{bash,cat,grep,pwd,rm,stty} .
    19 ln -sf bash sh
    20 cd ${CLFS}/usr/lib
    21 ln -sv ../../tools/lib/libgcc_s.so{,.1} .
    22 ln -sv ../../tools/lib/libstd*so* .
    23 ln -sv ../../tools/lib64/libgcc_s.so{,.1} .
    24 ln -sv ../../tools/lib64/libstd*so* .</userinput></screen>
     17<screen><userinput>ln -sv /tools/bin/{bash,cat,pwd,stty} ${CLFS}/bin
     18ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
     19ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
     20ln -sv /tools/lib/libstd* ${CLFS}/usr/lib
     21ln -sv /tools/lib64/libstd* ${CLFS}/usr/lib64
     22ln -sv bash ${CLFS}/bin/sh</userinput></screen>
    2523
    2624</sect1>

  • BOOK/boot/multilib/e2fsprogs.xml

    r8473983 rbc2e3fa  
    4343
    4444<screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
    45 --enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64} -fPIC" --with-linker=${LD} \
     45--enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" --with-linker=${LD} \
    4646--host=${CLFS_TARGET}</userinput></screen>
    4747

  • BOOK/boot/ppc/yaboot-build.xml

    r8473983 rbc2e3fa  
    6767    xpointer="xpointer(//*[@os='i'])"/>
    6868
    69 <screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=${CLFS} PREFIX=/tools install</userinput></screen>
     69<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX="" install</userinput></screen>
    7070
    7171  </sect2>

  • BOOK/boot/ppc64/yaboot-build.xml

    r8473983 rbc2e3fa  
    7575    xpointer="xpointer(//*[@os='j0'])"/>
    7676
    77 <screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=${CLFS} PREFIX=/tools install 2&gt;&amp;1 | tee instlog</userinput></screen>
     77<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX= install 2&gt;&amp;1 | tee instlog</userinput></screen>
    7878
    7979    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/boot/sparc/elftoaout.xml

    r8473983 rbc2e3fa  
    3737    <para>Install the package:</para>
    3838
    39 <screen><userinput>install -v -m 0755 -s elftoaout ${CLFS}/cross-tools/bin</userinput></screen>
     39<screen><userinput>install -v -m 0755 -s elftoaout /cross-tools/bin</userinput></screen>
    4040
    4141  </sect2>

  • BOOK/boot/x86/grub.xml

    r8473983 rbc2e3fa  
    3535  xpointer="xpointer(//*[@os='f'])"/>
    3636
    37 <screen os="g"><userinput>make DESTDIR=${CLFS} install
    38 mkdir -pv ${CLFS} /boot/grub
    39 cp -v ${CLFS}/usr/lib/grub/*/stage{1,2} ${CLFS}/boot/grub</userinput></screen>
     37  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     38  href="../../bootable/x86/grub.xml"
     39  xpointer="xpointer(//*[@os='g'])"/>
    4040
    4141  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/boot/x86_64-64/bin86.xml

    r8473983 rbc2e3fa  
    4848      output is not for a native system.</para>
    4949
    50 <screen os="f"><userinput>install -v -m 755 -s as/as86 ${CLFS}/cross-tools/bin/${CLFS_TARGET}-as86
    51 install -v -m 755 -s ld/ld86 ${CLFS}/cross-tools/bin/${CLFS_TARGET}-ld86</userinput></screen>
     50<screen os="f"><userinput>install -v -m 755 -s as/as86 /cross-tools/bin/${CLFS_TARGET}-as86
     51install -v -m 755 -s ld/ld86 /cross-tools/bin/${CLFS_TARGET}-ld86</userinput></screen>
    5252
    5353  </sect2>

  • BOOK/boot/x86_64-64/lilo-build.xml

    r8473983 rbc2e3fa  
    3434      when it runs:</para>
    3535
    36 <screen os="d"><userinput>make -k lilo.static</userinput></screen>
     36<screen os="d"><userinput>make lilo-static</userinput></screen>
    3737
    3838    <para os="e">Install only the parts we need:</para>
    3939
    40 <screen os="f"><userinput>install -v -m755 lilo-static ${CLFS}/tools/bin
    41 install -v -m755 keytab-lilo.pl ${CLFS}/tools/bin</userinput></screen>
     40<screen os="f"><userinput>install -v -m755 lilo-static /tools/bin
     41install -v -m755 keytab-lilo.pl /tools/bin</userinput></screen>
    4242
    4343  </sect2>

  • BOOK/chroot/common/createfiles.xml

    r8473983 rbc2e3fa  
    1717<screen><userinput>ln -sv /tools/bin/{bash,cat,grep,pwd,rm,stty} /bin
    1818ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
    19 ln -sv /tools/lib/libstd*so* /usr/lib
     19ln -sv /tools/lib/libstd* /usr/lib
    2020ln -sv bash /bin/sh</userinput></screen>
    2121

  • BOOK/chroot/common/util-linux.xml

    r8473983 rbc2e3fa  
    7878    <para os="cg">Copy these programs to the temporary tools directory:</para>
    7979
    80 <screen os="ch"><userinput>cp -v mount/{,u}mount text-utils/more ${CLFS}/tools/bin</userinput></screen>
     80<screen os="ch"><userinput>cp -v mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
    8181
    8282  </sect2>

  • BOOK/chroot/mips64/createfiles.xml

    r8473983 rbc2e3fa  
    1919ln -sv /tools/lib32/libgcc_s.so{,.1} /usr/lib32
    2020ln -sv /tools/lib64/libgcc_s.so{,.1} /usr/lib64
    21 ln -sv /tools/lib/libstd*so* /usr/lib
    22 ln -sv /tools/lib32/libstd*so* /usr/lib32
    23 ln -sv /tools/lib64/libstd*so* /usr/lib64
     21ln -sv /tools/lib/libstd* /usr/lib
     22ln -sv /tools/lib32/libstd* /usr/lib32
     23ln -sv /tools/lib64/libstd* /usr/lib64
    2424ln -sv bash /bin/sh</userinput></screen>
    2525

  • BOOK/chroot/multilib/createfiles.xml

    r8473983 rbc2e3fa  
    1818ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
    1919ln -sv /tools/lib64/libgcc_s.so{,.1} /usr/lib64
    20 ln -sv /tools/lib/libstd*so* /usr/lib
    21 ln -sv /tools/lib64/libstd*so* /usr/lib64
     20ln -sv /tools/lib/libstd* /usr/lib
     21ln -sv /tools/lib64/libstd* /usr/lib64
    2222ln -sv bash /bin/sh</userinput></screen>
    2323

  • BOOK/cross-tools/64/binutils.xml

    r8473983 rbc2e3fa  
    5555    xpointer="xpointer(//*[@os='i'])"/>
    5656
    57 <screen os="bc"><userinput>../binutils-&binutils-version;/configure \
    58     --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} --host=${CLFS_HOST} \
    59     --target=${CLFS_TARGET} --disable-nls --enable-shared \
    60     --enable-64-bit-bfd --disable-multilib --with-lib-path=${CLFS}/tools/lib</userinput></screen>
     57<screen os="ca"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
     58   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
     59   --disable-nls --enable-shared --enable-64-bit-bfd --disable-multilib</userinput></screen>
    6160
    6261    <variablelist os="bd">

  • BOOK/cross-tools/64/glibc.xml

    r8473983 rbc2e3fa  
    6969    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    7070    href="../common/glibc.xml"
    71     xpointer="xpointer(//*[@os='n2'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="../common/glibc.xml"
    75     xpointer="xpointer(//*[@os='n1'])"/>
    76 
    77     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    78     href="../common/glibc.xml"
    7971    xpointer="xpointer(//*[@os='g'])"/>
    8072
    … …  
    8577    --disable-profile --enable-add-ons \
    8678    --with-tls --enable-kernel=2.6.0 --with-__thread \
    87     --with-binutils=${CLFS}/cross-tools/bin \
    88     --with-headers=${CLFS}/tools/include \
     79    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    8980    --cache-file=config.cache</userinput></screen>
    9081

  • BOOK/cross-tools/alpha/gcc-static.xml

    r8473983 rbc2e3fa  
    7676    xpointer="xpointer(//*[@os='h'])"/>
    7777
    78 <screen><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} \
     78<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
    7979    --host=${CLFS_HOST} --target=${CLFS_TARGET} \
    8080    --with-local-prefix=/tools --disable-nls --disable-shared \

  • BOOK/cross-tools/alpha/glibc-headers.xml

    r8473983 rbc2e3fa  
    4949
    5050    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    51     href="../common/glibc.xml"
    52     xpointer="xpointer(//*[@os='n1'])"/>
    53 
    54     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    55     href="../common/glibc.xml"
    56     xpointer="xpointer(//*[@os='n2'])"/>
    57 
    58     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    5951    href="../../final-system/common/glibc.xml"
    6052    xpointer="xpointer(//*[@os='g'])"/>
    … …  
    6355   --host=${CLFS_TARGET} --build=${CLFS_HOST} \
    6456   --disable-sanity-checks --enable-kernel=2.6.0 \
    65    --with-headers=${CLFS}/tools/include --cache-file=config.cache \
    66    --with-binutils=${CLFS}/cross-tools/${CLFS_TARGET}/bin</userinput></screen>
     57   --with-headers=/tools/include --cache-file=config.cache \
     58   --with-binutils=/cross-tools/${CLFS_TARGET}/bin</userinput></screen>
    6759
    6860    <note os="e1">
    … …  
    122114       
    123115       <varlistentry os="ca7">
    124            <term><parameter>--with-headers=${CLFS}/tools/include</parameter></term>
     116           <term><parameter>--with-headers=/tools/include</parameter></term>
    125117           <listitem>
    126118              <para>This tells Glibc to compile itself against the headers
    127               recently installed to the <filename class="directory">${CLFS}/tools</filename>
     119              recently installed to the <filename class="directory">/tools</filename>
    128120              directory, so that it knows exactly what features the kernel has
    129121              and can optimize itself accordingly.</para>
    … …  
    132124       
    133125       <varlistentry os="ca8">
    134            <term><parameter>--with-binutils=${CLFS}/cross-tools/${CLFS_TARGET}/bin</parameter></term>
     126           <term><parameter>--with-binutils=/cross-tools/${CLFS_TARGET}/bin</parameter></term>
    135127           <listitem>
    136128              <para>This tells Glibc to use the Binutils for our specific target architecture.</para>
    … …  
    148140
    149141   <para os="cf">First we will copy a common file over to <filename
    150    class="directory">${CLFS}/tools/include</filename>:</para>
     142   class="directory">/tools/include</filename>:</para>
    151143
    152 <screen os="cg"><userinput>install -dv ${CLFS}/tools/include/bits
    153 cp -v bits/stdio_lim.h ${CLFS}/tools/include/bits</userinput></screen>
     144<screen os="cg"><userinput>install -dv /tools/include/bits
     145cp -v bits/stdio_lim.h /tools/include/bits</userinput></screen>
    154146
    155147   <para os="ch">Now we will create a blank stub file:</para>
    156148
    157 <screen os="ci"><userinput>touch ${CLFS}/tools/include/gnu/stubs.h</userinput></screen>
     149<screen os="ci"><userinput>touch /tools/include/gnu/stubs.h</userinput></screen>
    158150
    159151   <para os="cj">Another header is needed for NPTL:</para>
    160152   
    161 <screen><userinput>cp -v ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h \
    162     ${CLFS}/tools/include/bits/</userinput></screen>
     153<screen><userinput>cp -v ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h /tools/include/bits/</userinput></screen>
    163154
    164155  </sect2>

  • BOOK/cross-tools/alpha/glibc.xml

    r8473983 rbc2e3fa  
    7676
    7777    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    78     href="../common/glibc.xml"
    79     xpointer="xpointer(//*[@os='n1'])"/>
    80 
    81     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    82     href="../common/glibc.xml"
    83     xpointer="xpointer(//*[@os='n2'])"/>
    84 
    85     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    8678    href="../../final-system/common/glibc.xml"
    8779    xpointer="xpointer(//*[@os='g'])"/>

  • BOOK/cross-tools/alpha/linux-headers.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>install -dv ${CLFS}/tools/include
    30 cp -av include/asm-alpha ${CLFS}/tools/include/asm
    31 cp -av include/{asm-generic,linux} ${CLFS}/tools/include/</userinput></screen>
     29<screen><userinput>install -dv /tools/include
     30cp -av include/asm-alpha /tools/include/asm
     31cp -av include/{asm-generic,linux} /tools/include/</userinput></screen>
    3232
    3333  </sect2>

  • BOOK/cross-tools/common/binutils.xml

    r8473983 rbc2e3fa  
    5353    xpointer="xpointer(//*[@os='i'])"/>
    5454
    55 <screen os="bc"><userinput>../binutils-&binutils-version;/configure \
    56     --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} --host=${CLFS_HOST} \
    57     --target=${CLFS_TARGET} --disable-nls --enable-shared \
    58     --disable-multilib --with-lib-path=${CLFS}/tools/lib</userinput></screen>
     55<screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
     56    --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
     57    --disable-nls --enable-shared --disable-multilib</userinput></screen>
    5958
    6059    <variablelist os="bd">
    … …  
    6261
    6362      <varlistentry os="bd1">
    64         <term><parameter>--prefix=${CLFS}/cross-tools</parameter></term>
     63        <term><parameter>--prefix=/cross-tools</parameter></term>
    6564        <listitem>
    6665          <para>This tells the configure script to prepare to install the
    67           package in the <filename class="directory">${CLFS}/cross-tools</filename>
     66          package in the <filename class="directory">/cross-tools</filename>
    6867          directory.</para>
    6968        </listitem>
    … …  
    7170
    7271      <varlistentry os="bd2">
    73         <term><parameter>--with-sysroot=${CLFS}</parameter></term>
    74         <listitem>
    75           <para>This tells configure that
    76           <filename class="directory">${CLFS}</filename> is going to be
    77           the root of our system. It will now use the specified sysroot,
    78           <filename class="directory">${CLFS}</filename>.</para>
    79         </listitem>
    80       </varlistentry>
    81 
    82       <varlistentry os="bd3">
    8372        <term><parameter>--host=${CLFS_HOST}</parameter></term>
    8473        <listitem>
    … …  
    8877      </varlistentry>
    8978
    90       <varlistentry os="bd4">
     79      <varlistentry os="bd3">
    9180        <term><parameter>--target=${CLFS_TARGET}</parameter></term>
    9281        <listitem>
    9382          <para>When used with --host, this creates a cross-architecture
    9483          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
     84        </listitem>
     85      </varlistentry>
     86
     87      <varlistentry os="bd4">
     88        <term><parameter>--with-lib-path=/tools/lib</parameter></term>
     89        <listitem>
     90          <para>This tells the configure script to specify the library
     91          search path during the compilation of Binutils, resulting in
     92          <filename class="directory">/tools/lib</filename> being passed
     93          to the linker. This prevents the linker from searching through
     94          library directories on the host.</para>
    9595        </listitem>
    9696      </varlistentry>
    … …  
    144144
    145145    <para os="bj">Copy <filename class="headerfile">libiberty.h</filename> to
    146     <filename class="directory">${CLFS}/tools/include</filename> directory:</para>
     146    <filename class="directory">/tools/include</filename> directory:</para>
    147147
    148 <screen os="bk"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h ${CLFS}/tools/include</userinput></screen>
     148<screen os="bk"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h /tools/include</userinput></screen>
    149149
    150150  </sect2>

  • BOOK/cross-tools/common/glibc.xml

    r8473983 rbc2e3fa  
    6161echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache</userinput></screen>
    6262
    63     <para os="n1">The following line needs to be added to
    64     <filename>configparms</filename> to adjust installation paths.</para>
    65 
    66 <screen os="n2"><userinput>echo "install_root=${CLFS}" &gt; configparms</userinput></screen>
    67 
    6863    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6964    href="../../final-system/common/glibc.xml"
    … …  
    7671    --disable-profile --enable-add-ons \
    7772    --with-tls --enable-kernel=2.6.0 --with-__thread \
    78     --with-binutils=${CLFS}/cross-tools/bin \
    79     --with-headers=${CLFS}/tools/include \
     73    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    8074    --cache-file=config.cache</userinput></screen>
    8175
    … …  
    147141
    148142      <varlistentry os="dg9">
    149         <term><parameter>--with-binutils=${CLFS}/cross-tools/bin</parameter></term>
     143        <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
    150144        <listitem>
    151145          <para>This tells Glibc to use the Binutils that are specific to

  • BOOK/cross-tools/mips-chapter.xml

    r8473983 rbc2e3fa  
    1717  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
    19   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/glibc-headers.xml"/>
    2019  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-static.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/glibc.xml"/>

  • BOOK/cross-tools/mips/glibc.xml

    r8473983 rbc2e3fa  
    8484
    8585    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    86     href="../common/glibc.xml"
    87     xpointer="xpointer(//*[@os='n1'])"/>
    88 
    89     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    90     href="../common/glibc.xml"
    91     xpointer="xpointer(//*[@os='n2'])"/>
    92 
    93     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    9486    href="../../final-system/common/glibc.xml"
    9587    xpointer="xpointer(//*[@os='g'])"/>

  • BOOK/cross-tools/mips/linux-headers.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>install -dv ${CLFS}/tools/include
    30 cp -av include/asm-mips ${CLFS}/tools/include/asm
    31 cp -av include/{asm-generic,linux} ${CLFS}/tools/include/</userinput></screen>
     29<screen><userinput>install -dv /tools/include
     30cp -av include/asm-mips /tools/include/asm
     31cp -av include/{asm-generic,linux} /tools/include/</userinput></screen>
    3232
    3333  </sect2>

  • BOOK/cross-tools/mips64-64-chapter.xml

    r8473983 rbc2e3fa  
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/glibc-headers.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/gcc-static.xml"/>
    2221  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/glibc.xml"/>

  • BOOK/cross-tools/mips64-64/gcc-final.xml

    r8473983 rbc2e3fa  
    8383    xpointer="xpointer(//*[@os='h'])"/>
    8484
    85 <screen os="bf" ><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} \
     85<screen os="bf" ><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
    8686    --target=${CLFS_TARGET} --host=${CLFS_HOST} --with-abi=64 \
    8787    --with-local-prefix=/tools --disable-nls --enable-shared \

  • BOOK/cross-tools/mips64-64/gcc-static.xml

    r8473983 rbc2e3fa  
    7676    xpointer="xpointer(//*[@os='h'])"/>
    7777
    78 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} \
     78<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
    7979    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-mutlilib \
    8080    --with-local-prefix=/tools --disable-nls --disable-shared \

  • BOOK/cross-tools/mips64-64/glibc.xml

    r8473983 rbc2e3fa  
    8585    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    8686    href="../common/glibc.xml"
    87     xpointer="xpointer(//*[@os='n1'])"/>
    88 
    89     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    90     href="../common/glibc.xml"
    91     xpointer="xpointer(//*[@os='n2'])"/>
    92 
    93     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    94     href="../common/glibc.xml"
    9587    xpointer="xpointer(//*[@os='g'])"/>
    9688

  • BOOK/cross-tools/mips64-chapter.xml

    r8473983 rbc2e3fa  
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/glibc-headers.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/gcc-static.xml"/>
    2221  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc.xml"/>

  • BOOK/cross-tools/mips64/glibc-64bit.xml

    r8473983 rbc2e3fa  
    8484
    8585    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    86     href="glibc.xml"
     86    href="../multilib/glibc-64bit.xml"
    8787    xpointer="xpointer(//*[@os='n1'])"/>
    8888
    8989    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    90     href="glibc.xml"
     90    href="../multilib/glibc-64bit.xml"
    9191    xpointer="xpointer(//*[@os='n2'])"/>
    92 
    93     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    94     href="../multilib/glibc-64bit.xml"
    95     xpointer="xpointer(//*[@os='n3'])"/>
    96 
    97     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    98     href="../multilib/glibc-64bit.xml"
    99     xpointer="xpointer(//*[@os='n4'])"/>
    10092
    10193    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/cross-tools/mips64/glibc-n32.xml

    r8473983 rbc2e3fa  
    8383    xpointer="xpointer(//*[@os='de'])"/>
    8484
    85     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    86     href="glibc.xml"
    87     xpointer="xpointer(//*[@os='n1'])"/>
    88 
    89     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    90     href="glibc.xml"
    91     xpointer="xpointer(//*[@os='n2'])"/>
    92 
    93     <para os="n3">Tell Glibc to install its 32-bit libraries into <filename
     85    <para os="n1">Tell Glibc to install its 32-bit libraries into <filename
    9486    class="directory">/tools/lib32</filename>:</para>
    9587
    96 <screen os="n4"><userinput>echo "slibdir=/tools/lib32" &gt;&gt; configparms</userinput></screen>
     88<screen os="n2"><userinput>echo "slibdir=/tools/lib32" &gt;&gt; configparms</userinput></screen>
    9789
    9890    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    10698    --disable-profile --enable-add-ons \
    10799    --with-tls --enable-kernel=2.6.0 --with-__thread \
    108     --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/tools/include \
     100    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    109101    --cache-file=config.cache</userinput></screen>
    110102

  • BOOK/cross-tools/mips64/glibc.xml

    r8473983 rbc2e3fa  
    8585    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    8686    href="../common/glibc.xml"
    87     xpointer="xpointer(//*[@os='n1'])"/>
    88 
    89     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    90     href="../common/glibc.xml"
    91     xpointer="xpointer(//*[@os='n2'])"/>
    92 
    93     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    94     href="../common/glibc.xml"
    9587    xpointer="xpointer(//*[@os='g'])"/>
    9688

  • BOOK/cross-tools/multilib/binutils.xml

    r8473983 rbc2e3fa  
    6363    xpointer="xpointer(//*[@os='i'])"/>
    6464
    65 <screen os="bc"><userinput>../binutils-&binutils-version;/configure \
    66     --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} --host=${CLFS_HOST} \
    67     --target=${CLFS_TARGET} --disable-nls --enable-shared \
    68     --enable-64-bit-bfd --with-lib-path=${CLFS}/tools/lib</userinput></screen>
     65<screen os="bc"><userinput>../binutils-&binutils-version;/configure --prefix=/cross-tools \
     66   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
     67   --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
    6968
    7069    <variablelist os="bd">

  • BOOK/cross-tools/multilib/glibc-64bit.xml

    r8473983 rbc2e3fa  
    6767    xpointer="xpointer(//*[@os='de'])"/>
    6868
    69     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    70     href="glibc.xml"
    71     xpointer="xpointer(//*[@os='n1'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="glibc.xml"
    75     xpointer="xpointer(//*[@os='n2'])"/>
    76 
    77     <para os="n3">Tell Glibc to install its 64-bit libraries into <filename
     69    <para os="n1">Tell Glibc to install its 64-bit libraries into <filename
    7870    class="directory">/tools/lib64</filename>:</para>
    7971
    80 <screen os="n4"><userinput>echo "slibdir=/tools/lib64" &gt;&gt; configparms</userinput></screen>
     72<screen os="n2"><userinput>echo "slibdir=/tools/lib64" &gt;&gt; configparms</userinput></screen>
    8173
    8274    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    9082    --disable-profile --enable-add-ons \
    9183    --with-tls --enable-kernel=2.6.0 --with-__thread \
    92     --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/tools/include \
     84    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    9385    --cache-file=config.cache</userinput></screen>
    9486

  • BOOK/cross-tools/multilib/glibc.xml

    r8473983 rbc2e3fa  
    6969    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    7070    href="../common/glibc.xml"
    71     xpointer="xpointer(//*[@os='n1'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="../common/glibc.xml"
    75     xpointer="xpointer(//*[@os='n2'])"/>
    76 
    77     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    78     href="../common/glibc.xml"
    7971    xpointer="xpointer(//*[@os='g'])"/>
    8072
    … …  
    8577    --disable-profile --enable-add-ons \
    8678    --with-tls --enable-kernel=2.6.0 --with-__thread \
    87     --with-binutils=${CLFS}/cross-tools/bin \
    88     --with-headers=${CLFS}/tools/include \
     79    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    8980    --cache-file=config.cache</userinput></screen>
    9081

  • BOOK/cross-tools/ppc-chapter.xml

    r8473983 rbc2e3fa  
    1717  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/linux-headers.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
    19   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/glibc-headers.xml"/>
    2019  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/gcc-static.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/glibc.xml"/>

  • BOOK/cross-tools/ppc/glibc.xml

    r8473983 rbc2e3fa  
    6868
    6969    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    70     href="../common/glibc.xml"
    71     xpointer="xpointer(//*[@os='n1'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="../common/glibc.xml"
    75     xpointer="xpointer(//*[@os='n2'])"/>
    76 
    77     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    7870    href="../../final-system/common/glibc.xml"
    7971    xpointer="xpointer(//*[@os='g'])"/>

  • BOOK/cross-tools/ppc/linux-headers.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>install -dv ${CLFS}/tools/include
    30 cp -av include/asm-powerpc ${CLFS}/tools/include/asm
    31 cp -av include/{asm-generic,asm-ppc,linux} ${CLFS}/tools/include/</userinput></screen>
     29<screen><userinput>install -dv /tools/include
     30cp -av include/asm-powerpc /tools/include/asm
     31cp -av include/{asm-generic,asm-ppc,linux} /tools/include/</userinput></screen>
    3232
    3333  </sect2>

  • BOOK/cross-tools/ppc64/glibc-64bit.xml

    r8473983 rbc2e3fa  
    7474
    7575    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    76     href="glibc.xml"
     76    href="../multilib/glibc-64bit.xml"
    7777    xpointer="xpointer(//*[@os='n1'])"/>
    7878
    7979    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    80     href="glibc.xml"
     80    href="../multilib/glibc-64bit.xml"
    8181    xpointer="xpointer(//*[@os='n2'])"/>
    82 
    83     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    84     href="../multilib/glibc-64bit.xml"
    85     xpointer="xpointer(//*[@os='n3'])"/>
    86 
    87     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    88     href="../multilib/glibc-64bit.xml"
    89     xpointer="xpointer(//*[@os='n4'])"/>
    9082
    9183    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    9991    --disable-profile --enable-add-ons \
    10092    --with-tls --enable-kernel=2.6.0 --with-__thread \
    101     --with-binutils=${CLFS}/cross-tools/bin --with-headers=${CLFS}/tools/include \
     93    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    10294    --cache-file=config.cache</userinput></screen>
    10395

  • BOOK/cross-tools/ppc64/glibc.xml

    r8473983 rbc2e3fa  
    8686    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    8787    href="../common/glibc.xml"
    88     xpointer="xpointer(//*[@os='n1'])"/>
    89 
    90     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    91     href="../common/glibc.xml"
    92     xpointer="xpointer(//*[@os='n2'])"/>
    93 
    94     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    95     href="../common/glibc.xml"
    9688    xpointer="xpointer(//*[@os='g'])"/>
    9789
    … …  
    10294    --disable-profile --enable-add-ons \
    10395    --with-tls --enable-kernel=2.6.0 --with-__thread \
    104     --with-binutils=${CLFS}/cross-tools/bin \
    105     --with-headers=${CLFS}/tools/include \
     96    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    10697    --cache-file=config.cache</userinput></screen>
    10798

  • BOOK/cross-tools/ppc64/linux-headers.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>install -dv ${CLFS}/tools/include
    30 cp -av include/asm-powerpc ${CLFS}/tools/include/asm
    31 cp -av include/{asm-generic,asm-ppc,linux} ${CLFS}/tools/include/</userinput></screen>
     29<screen><userinput>install -dv /tools/include
     30cp -av include/asm-powerpc /tools/include/asm
     31cp -av include/{asm-generic,asm-ppc,linux} /tools/include/</userinput></screen>
    3232
    3333  </sect2>

  • BOOK/cross-tools/sparc-chapter.xml

    r8473983 rbc2e3fa  
    1717  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-headers.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
    19   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/glibc-headers.xml"/>
    2019  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc-static.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/glibc.xml"/>

  • BOOK/cross-tools/sparc/glibc.xml

    r8473983 rbc2e3fa  
    6969    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    7070    href="../common/glibc.xml"
    71     xpointer="xpointer(//*[@os='n1'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="../common/glibc.xml"
    75     xpointer="xpointer(//*[@os='n2'])"/>
    76 
    77     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    78     href="../common/glibc.xml"
    7971    xpointer="xpointer(//*[@os='g'])"/>
    8072

  • BOOK/cross-tools/sparc/linux-headers.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>install -dv ${CLFS}/tools/include
    30 cp -av include/asm-sparc ${CLFS}/tools/include/asm
    31 cp -av include/{asm-generic,linux} ${CLFS}/tools/include/</userinput></screen>
     29<screen><userinput>install -dv /tools/include
     30cp -av include/asm-sparc /tools/include/asm
     31cp -av include/{asm-generic,linux} /tools/include/</userinput></screen>
    3232
    3333  </sect2>

  • BOOK/cross-tools/sparc64-64-chapter.xml

    r8473983 rbc2e3fa  
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc-headers.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/gcc-static.xml"/>
    2221  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/glibc.xml"/>

  • BOOK/cross-tools/sparc64-64/glibc.xml

    r8473983 rbc2e3fa  
    6969    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    7070    href="../common/glibc.xml"
    71     xpointer="xpointer(//*[@os='n1'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="../common/glibc.xml"
    75     xpointer="xpointer(//*[@os='n2'])"/>
    76 
    77     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    78     href="../common/glibc.xml"
    7971    xpointer="xpointer(//*[@os='g'])"/>
    8072
    … …  
    119111    this with the following:</para>
    120112
    121     <screen os="dp"><userinput>mv -v ${CLFS}/tools/include/gnu/stubs{-64,}.h</userinput></screen>
     113    <screen os="dp"><userinput>mv -v /tools/include/gnu/stubs{-64,}.h</userinput></screen>
    122114
    123115  </sect2>

  • BOOK/cross-tools/sparc64-64/linux-headers.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>install -dv ${CLFS}/tools/include
    30 cp -av include/asm-sparc64 ${CLFS}/tools/include/asm
    31 cp -av include/{asm-generic,linux} ${CLFS}/tools/include/</userinput></screen>
     29<screen><userinput>install -dv /tools/include
     30cp -av include/asm-sparc64 /tools/include/asm
     31cp -av include/{asm-generic,linux} /tools/include/</userinput></screen>
    3232
    3333  </sect2>

  • BOOK/cross-tools/sparc64-chapter.xml

    r8473983 rbc2e3fa  
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc-headers.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc-static.xml"/>
    2221  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc.xml"/>

  • BOOK/cross-tools/sparc64/glibc-64bit.xml

    r8473983 rbc2e3fa  
    6868
    6969    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    70     href="../common/glibc.xml"
     70    href="../multilib/glibc-64bit.xml"
    7171    xpointer="xpointer(//*[@os='n1'])"/>
    7272
    7373    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="../common/glibc.xml"
     74    href="../multilib/glibc-64bit.xml"
    7575    xpointer="xpointer(//*[@os='n2'])"/>
    76 
    77     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    78     href="../multilib/glibc-64bit.xml"
    79     xpointer="xpointer(//*[@os='n3'])"/>
    80 
    81     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    82     href="../multilib/glibc-64bit.xml"
    83     xpointer="xpointer(//*[@os='n4'])"/>
    8476
    8577    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/cross-tools/sparc64/glibc.xml

    r8473983 rbc2e3fa  
    6969    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    7070    href="../common/glibc.xml"
    71     xpointer="xpointer(//*[@os='n1'])"/>
    72 
    73     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="../common/glibc.xml"
    75     xpointer="xpointer(//*[@os='n2'])"/>
    76 
    77     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    78     href="../common/glibc.xml"
    7971    xpointer="xpointer(//*[@os='g'])"/>
    8072
    … …  
    8577    --disable-profile --enable-add-ons \
    8678    --with-tls --enable-kernel=2.6.0 --with-__thread \
    87     --with-binutils=${CLFS}/cross-tools/bin \
    88     --with-headers=${CLFS}/tools/include \
     79    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
    8980    --cache-file=config.cache</userinput></screen>
    9081

  • BOOK/cross-tools/sparc64/linux-headers.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>install -dv ${CLFS}/tools/include
    30 cp -av include/{asm-generic,asm-sparc,asm-sparc64,linux} ${CLFS}/tools/include/
    31 cp -av include/asm-sparc64-biarch ${CLFS}/tools/include/asm</userinput></screen>
     29<screen><userinput>install -dv /tools/include
     30cp -av include/{asm-generic,asm-sparc,asm-sparc64,linux} /tools/include/
     31cp -av include/asm-sparc64-biarch /tools/include/asm</userinput></screen>
    3232
    3333  </sect2>

  • BOOK/cross-tools/x86-chapter.xml

    r8473983 rbc2e3fa  
    1717  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/linux-headers.xml"/>
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
    19   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/glibc-headers.xml"/>
    2019  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/gcc-static.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/glibc.xml"/>

  • BOOK/cross-tools/x86/gcc-final.xml

    r8473983 rbc2e3fa  
    8989    xpointer="xpointer(//*[@os='h'])"/>
    9090
    91 <screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} \
     91<screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
    9292    --target=${CLFS_TARGET} --host=${CLFS_HOST} --disable-multilib \
    9393    --with-local-prefix=/tools --disable-nls --enable-shared \

  • BOOK/cross-tools/x86/gcc-static.xml

    r8473983 rbc2e3fa  
    5252
    5353<screen os="aj"><userinput>cp -v gcc/Makefile.in{,.orig}
    54 sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 ${CLFS}/tools/include@g" \
     54sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
    5555    gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
    5656
    … …  
    6767    xpointer="xpointer(//*[@os='h'])"/>
    6868
    69 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} \
     69<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
    7070    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
    7171    --with-local-prefix=/tools --disable-nls --disable-shared \

  • BOOK/cross-tools/x86/linux-headers.xml

    r8473983 rbc2e3fa  
    2525<para os="a">Install the header files that are needed for the base build:</para>
    2626
    27 <screen><userinput>install -dv ${CLFS}/tools/include
    28 cp -av include/asm-i386 ${CLFS}/tools/include/asm
    29 cp -av include/{asm-generic,linux} ${CLFS}/tools/include/</userinput></screen>
     27<screen><userinput>install -dv /tools/include
     28cp -av include/asm-i386 /tools/include/asm
     29cp -av include/{asm-generic,linux} /tools/include/</userinput></screen>
    3030
    3131  </sect2>

  • BOOK/cross-tools/x86/variables.xml

    r8473983 rbc2e3fa  
    2020  command:</para>
    2121
    22 <screen os="b"><userinput>export CLFS_HOST="$(sed 's/-*-[^-]*-/-cross-/' &lt;&lt;&lt; $MACHTYPE)"</userinput></screen>
     22<screen os="b"><userinput>export CLFS_HOST="$(echo $MACHTYPE | sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"</userinput></screen>
    2323
    2424  <para os="c">Now you will need to set the target triplet for the target

  • BOOK/cross-tools/x86_64-64-chapter.xml

    r8473983 rbc2e3fa  
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/glibc-headers.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc-static.xml"/>
    2221  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/glibc.xml"/>

  • BOOK/cross-tools/x86_64-64/gcc-static.xml

    r8473983 rbc2e3fa  
    7474    xpointer="xpointer(//*[@os='h'])"/>
    7575
    76 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} \
     76<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
    7777    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
    7878    --with-local-prefix=/tools --disable-nls --disable-shared \

  • BOOK/cross-tools/x86_64-64/linux-headers.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>install -dv ${CLFS}/tools/include
    30 cp -av include/asm-x86_64 ${CLFS}/tools/include/asm
    31 cp -av include/{asm-generic,linux} ${CLFS}/tools/include/</userinput></screen>
     29<screen><userinput>install -dv /tools/include
     30cp -av include/asm-x86_64 /tools/include/asm
     31cp -av include/{asm-generic,linux} /tools/include/</userinput></screen>
    3232
    3333  </sect2>

  • BOOK/cross-tools/x86_64-chapter.xml

    r8473983 rbc2e3fa  
    1818  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/linux-headers.xml"/>
    1919  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
    20   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/glibc-headers.xml"/>
    2120  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-static.xml"/>
    2221  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/glibc.xml"/>

  • BOOK/cross-tools/x86_64/gcc-final.xml

    r8473983 rbc2e3fa  
    9090    xpointer="xpointer(//*[@os='h'])"/>
    9191
    92 <screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} \
     92<screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
    9393    --target=${CLFS_TARGET} --host=${CLFS_HOST} \
    9494    --with-local-prefix=/tools --disable-nls --enable-shared \

  • BOOK/cross-tools/x86_64/gcc-static.xml

    r8473983 rbc2e3fa  
    7676    xpointer="xpointer(//*[@os='h'])"/>
    7777
    78 <screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools --with-sysroot=${CLFS} \
     78<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
    7979    --host=${CLFS_HOST} --target=${CLFS_TARGET} \
    8080    --with-local-prefix=/tools --disable-nls --disable-shared \

  • BOOK/cross-tools/x86_64/linux-headers.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen><userinput>install -dv ${CLFS}/tools/include
    30 cp -av include/{asm-generic,asm-i386,asm-x86_64,linux} ${CLFS}/tools/include/
    31 cp -av include/asm-x86_64-biarch ${CLFS}/tools/include/asm</userinput></screen>
     29<screen><userinput>install -dv /tools/include
     30cp -av include/{asm-generic,asm-i386,asm-x86_64,linux} /tools/include/
     31cp -av include/asm-x86_64-biarch /tools/include/asm</userinput></screen>
    3232
    3333  </sect2>

  • BOOK/final-preps/chapter.xml

    r8473983 rbc2e3fa  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="aboutclfs.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="creatingtoolsdir.xml"/>
     16  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="creatingcrossdir.xml"/>
    1617  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="addinguser.xml"/>
    1718  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="settingenviron.xml"/>

  • BOOK/final-preps/creatingtoolsdir.xml

    r8473983 rbc2e3fa  
    99  <?dbhtml filename="creatingtoolsdir.html"?>
    1010
    11   <title>Creating the temporary tools directories</title>
     11  <title>Creating the ${CLFS}/tools Directory</title>
    1212
    13   <para>The cross-binutils and cross-compiler built in
    14   <xref linkend="chapter-cross-tools"/> will be installed under
    15   <filename class="directory">${CLFS}/cross-tools</filename> to keep them
    16   separate from the host programs. The programs compiled here are
    17   cross-tools and will not be a part of the final CLFS system or the
    18   temp-system. Similarly, all programs compiled in
    19   <xref linkend="chapter-temp-system"/> will be installed under
    20   <filename class="directory">${CLFS}/tools</filename> to keep them separate
    21   from the programs compiled in <xref linkend="chapter-building-system"/>.
    22   This also prevents these programs from ending up in the host production
    23   directories (easy to do by accident in <xref linkend="chapter-temp-system"/>).
    24   By keeping the cross-compile tools and temporary-system programs in separate
    25   directories, they can easily be discarded later after their use.</para>
     13  <para>All programs compiled in <xref linkend="chapter-temp-system"/>
     14  will be installed under <filename class="directory">${CLFS}/tools</filename>
     15  to keep them separate from the programs compiled in <xref
     16  linkend="chapter-building-system"/>. The programs compiled here are
     17  temporary tools and will not be a part of the final CLFS system. By keeping
     18  these programs in a separate directory, they can easily be discarded later
     19  after their use. This also prevents these programs from ending up in the
     20  host production directories (easy to do by accident in <xref
     21  linkend="chapter-temp-system"/>).</para>
    2622
    27   <para>Create the required directories by running the following as
     23  <para>Create the required directory by running the following as
    2824  <systemitem class="username">root</systemitem>:</para>
    2925
    30 <screen><userinput>install -dv ${CLFS}/{tools,cross-tools}</userinput></screen>
     26<screen><userinput>install -dv ${CLFS}/tools</userinput></screen>
     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  <note>
     36    <para>The above command is correct. The <command>ln</command> command
     37    has a few syntactic variations, so be sure to check <command>info
     38    coreutils ln</command> and <filename>ln(1)</filename> before reporting
     39    what you may think is an error.</para>
     40  </note>
     41
     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>
    3146
    3247</sect1>

  • BOOK/final-preps/settingenviron.xml

    r8473983 rbc2e3fa  
    4444CLFS=/mnt/clfs
    4545LC_ALL=POSIX
    46 PATH=${CLFS}/cross-tools/bin:/bin:/usr/bin
     46PATH=/cross-tools/bin:/bin:/usr/bin
    4747export CLFS LC_ALL PATH</literal>
    4848EOF</userinput></screen>
    … …  
    5656  the shell will always search the <envar>PATH</envar> when a program is to
    5757  be run. As such, the shell will find the newly compiled tools in
    58   <filename class="directory">${CLFS}/cross-tools</filename> as soon as they are
     58  <filename class="directory">/cross-tools</filename> as soon as they are
    5959  available without remembering a previous version of the same program in a
    6060  different location.</para>
    … …  
    7979  the chroot environment.</para>
    8080
    81   <para os="j">By putting <filename class="directory">${CLFS}/cross-tools/bin</filename>
     81  <para os="j">By putting <filename class="directory">/cross-tools/bin</filename>
    8282  at the beginning of the <envar>PATH</envar>, the cross-compiler
    8383  built in <xref linkend="chapter-cross-tools"/> will be picked up by
    … …  
    8585  may be installed on the host. This, combined with turning off
    8686  hashing, helps to ensure that you will be using the cross-compile
    87   tools to build the temp-system in ${CLFS}/tools.</para>
     87  tools to build the temp-system in /tools.</para>
    8888
    8989  <para os="k">Finally, to have the environment fully prepared for building the

  • BOOK/general.ent

    r8473983 rbc2e3fa  
    22
    33<!ENTITY month "12"> <!-- Use two digits -->
    4 <!ENTITY month_name "December">
    5 <!ENTITY day "07"> <!-- Use two digits -->
     4<!ENTITY month_name "November">
     5<!ENTITY day "02"> <!-- Use two digits -->
    66<!ENTITY year "2006"> <!-- Use four digits -->
    77

  • BOOK/introduction/common/changelog.xml

    r8473983 rbc2e3fa  
    4646          <para>[jim] - Updated to Coreutils 6.7.</para>
    4747        </listitem>
    48       </itemizedlist>
    49     </listitem>
    50 
    51     <listitem>
    52       <para>December 5, 2006</para>
    53       <itemizedlist>
    54         <listitem>
    55           <para>[jim] - Fixed lilo build in boot section. Trac Ticket #99.</para>
    56         </listitem>
    57         <listitem>
    58           <para>[jim] - Added Binutils Branch Update Patch.</para>
    59         </listitem>
    60         <listitem>
    61           <para>[jim] - Updated Essential Symlinks for boot section.</para>
    62         </listitem>
    63         <listitem>
    64           <para>[jim] - Reverted change in gettext build in temp-system.</para>
    65         </listitem>
    66       </itemizedlist>
    67     </listitem>
    68 
    69     <listitem>
    70       <para>December 4, 2006</para>
    71       <itemizedlist>
    72         <listitem>
    73           <para>[Chris] - Combined creation of ${CLFS}/tools and
    74           ${CLFS}/cross-tools onto one page.</para>
    75         </listitem>
    76         <listitem>
    77           <para>[jim] - Updated to Linux Headers 2.6.19-12042006.</para>
    78         </listitem>
    79       </itemizedlist>
    80     </listitem>
    81 
    82     <listitem>
    83       <para>December 3, 2006</para>
    84       <itemizedlist>
    85         <listitem>
    86           <para>[jim] - Removed file from testsuite section and moved to temp-system.</para>
    87         </listitem>
    88         <listitem>
    89           <para>[jim] - Removed zlib from boot section and moved to temp-system.</para>
     48        <listitem>
     49          <para>[jim] - Reverting sysroot changes.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
     55      <para>December 1, 2006</para>
     56      <itemizedlist>
     57        <listitem>
     58          <para>[jim] - Updated to Man-Pages 2.43.</para>
    9059        </listitem>
    9160        <listitem>
    … …  
    9362          upstream patch will all current updates to the 2.5 branch of glibc.</para>
    9463        </listitem>
    95       </itemizedlist>
    96     </listitem>
    97 
    98     <listitem>
    99       <para>December 2, 2006</para>
    100       <itemizedlist>
    101         <listitem>
    102           <para>[jim and jciccone] - Converting /cross-tools and /tools to sysroot builds.</para>
    103         </listitem>
    104       </itemizedlist>
    105     </listitem>
    106 
    107     <listitem>
    108       <para>December 1, 2006</para>
    109       <itemizedlist>
    110         <listitem>
    111           <para>[jim] - Updated to Man-Pages 2.43.</para>
    112         </listitem>
    113       </itemizedlist>
    114     </listitem>
    115 
    116     <listitem>
    117       <para>November 39, 2006</para>
     64        <listitem>
     65          <para>[jim] - Added Binutils Branch Update Patch.</para>
     66        </listitem>
     67        <listitem>
     68          <para>[jim] - Reverted change in gettext build in temp-system.</para>
     69        </listitem>
     70        <listitem>
     71          <para>[jim] - Updated to Coreutils 6.7.</para>
     72        </listitem>
     73      </itemizedlist>
     74    </listitem>
     75
     76    <listitem>
     77      <para>November 29, 2006</para>
    11878      <itemizedlist>
    11979        <listitem>

  • BOOK/materials/common/patches.xml

    r8473983 rbc2e3fa  
    200200
    201201    <varlistentry>
    202       <term>Patch DESTDIR Patch - <token>&patch-destdir-patch-size;</token>:</term>
    203       <listitem>
    204         <para>Download: <ulink
    205         url="&patches-root;&patch-destdir-patch;"/></para>
    206         <para>MD5 sum: <literal>&patch-destdir-patch-md5;</literal></para>
    207       </listitem>
    208     </varlistentry>
    209 
    210     <varlistentry>
    211202      <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
    212203      <listitem>
    … …  
    283274        url="&patches-root;&vim-fixes-patch;"/></para>
    284275        <para>MD5 sum: <literal>&vim-fixes-patch-md5;</literal></para>
    285       </listitem>
    286     </varlistentry>
    287 
    288     <varlistentry>
    289       <term>Zlib DESTDIR Patch - <token>&zlib-destdir-patch-size;</token>:</term>
    290       <listitem>
    291         <para>Download: <ulink
    292         url="&patches-root;&zlib-destdir-patch;"/></para>
    293         <para>MD5 sum: <literal>&zlib-destdir-patch-md5;</literal></para>
    294276      </listitem>
    295277    </varlistentry>

  • BOOK/patches.ent

    r8473983 rbc2e3fa  
    8585<!ENTITY mktemp-tempfile-patch-size "3.6 KB">
    8686
    87 <!ENTITY patch-destdir-patch "patch-&patch-version;-DESTDIR-1.patch">
    88 <!ENTITY patch-destdir-patch-md5 "3a7521b7dbc805caa1d3da9490668f88">
    89 <!ENTITY patch-destdir-patch-size "4 KB">
    90 
    9187<!ENTITY perl-libc-patch "perl-&perl-version;-libc-2.patch">
    9288<!ENTITY perl-libc-patch-md5 "3bf8aef1fb6eb6110405e699e4141f99">
    … …  
    129125<!ENTITY vim-fixes-patch-size "320 KB">
    130126
    131 <!ENTITY zlib-destdir-patch "zlib-&zlib-version;-DESTDIR-1.patch">
    132 <!ENTITY zlib-destdir-patch-md5 "d21bdd08bf444f87f275b6aef44e1a84">
    133 <!ENTITY zlib-destdir-patch-size "8 KB">
    134 
    135127<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
    136128<!ENTITY zlib-fpic-patch-md5 "545d60b20bfde6f53023de44438cef59">

  • BOOK/temp-system/common/bash.xml

    r8473983 rbc2e3fa  
    7575    xpointer="xpointer(//*[@os='m'])"/>
    7676
    77 <screen os="n"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     77<screen os="n"><userinput>make install</userinput></screen>
    7878
    7979    <para os="ae">Make a link for programs that use <command>sh</command> for
    8080    a shell:</para>
    8181
    82 <screen os="af"><userinput>ln -sv bash ${CLFS}/tools/bin/sh</userinput></screen>
     82<screen os="af"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
    8383
    8484  </sect2>

  • BOOK/temp-system/common/binutils.xml

    r8473983 rbc2e3fa  
    6767    xpointer="xpointer(//*[@os='bh'])"/>
    6868
    69     <screen os="bi"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     69    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     70    href="../../cross-tools/common/binutils.xml"
     71    xpointer="xpointer(//*[@os='bi'])"/>
    7072
    7173  </sect2>

  • BOOK/temp-system/common/bzip2.xml

    r8473983 rbc2e3fa  
    3838    <para os="cd">Install the package:</para>
    3939
    40 <screen os="ce"><userinput>make PREFIX=${CLFS}/tools install</userinput></screen>
     40<screen os="ce"><userinput>make PREFIX=/tools install</userinput></screen>
    4141
    4242  </sect2>

  • BOOK/temp-system/common/choose.xml

    r8473983 rbc2e3fa  
    2828 commands to see if you can chroot:</para>
    2929
    30 <screen><userinput>${CLFS}/tools/lib/&glibc-ld-name; ${CLFS}/tools/lib/libc.so.6
    31 ${CLFS}/tools/lib/&glibc-ld-name; --library-path ${CLFS}/tools/lib \
    32     ${CLFS}/tools/bin/gcc -v</userinput></screen>
     30<screen ><userinput>/tools/lib/libc.so.6
     31/tools/bin/gcc -v</userinput></screen>
    3332
    3433  <para>If either of these commands fail, you will have to follow the boot

  • BOOK/temp-system/common/coreutils.xml

    r8473983 rbc2e3fa  
    4545    <para os="bh">Install the package:</para>
    4646
    47 <screen os="bi"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     47<screen os="bi"><userinput>make install</userinput></screen>
    4848
    4949  </sect2>

  • BOOK/temp-system/common/diffutils.xml

    r8473983 rbc2e3fa  
    3434    <para os="e">Install the package:</para>
    3535
    36 <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     36<screen os="f"><userinput>make install</userinput></screen>
    3737
    3838  </sect2>

  • BOOK/temp-system/common/findutils.xml

    r8473983 rbc2e3fa  
    4848    xpointer="xpointer(//*[@os='g'])"/>
    4949
    50 <screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     50    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     51    href="../../final-system/common/findutils.xml"
     52    xpointer="xpointer(//*[@os='h'])"/>
    5153
    5254  </sect2>

  • BOOK/temp-system/common/gawk.xml

    r8473983 rbc2e3fa  
    3434    <para os="e">Install the package:</para>
    3535
    36 <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     36<screen os="f"><userinput>make install</userinput></screen>
    3737
    3838  </sect2>

  • BOOK/temp-system/common/grep.xml

    r8473983 rbc2e3fa  
    5858    xpointer="xpointer(//*[@os='f'])"/>
    5959
    60 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     60    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     61    href="../../final-system/common/grep.xml"
     62    xpointer="xpointer(//*[@os='g'])"/>
    6163
    6264  </sect2>

  • BOOK/temp-system/common/gzip.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="ac"><userinput>./configure --prefix=/tools \
     29<screen os="b"><userinput>./configure --prefix=/tools \
    3030    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    3131
    … …  
    4242    xpointer="xpointer(//*[@os='f'])"/>
    4343
    44 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../../final-system/common/gzip.xml"
     46    xpointer="xpointer(//*[@os='g'])"/>
    4547
    4648  </sect2>

  • BOOK/temp-system/common/make.xml

    r8473983 rbc2e3fa  
    4242    xpointer="xpointer(//*[@os='f'])"/>
    4343
    44 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../../final-system/common/make.xml"
     46    xpointer="xpointer(//*[@os='g'])"/>
    4547
    4648  </sect2>

  • BOOK/temp-system/common/ncurses.xml

    r8473983 rbc2e3fa  
    9090    xpointer="xpointer(//*[@os='f'])"/>
    9191
    92 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     92    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     93    href="../../final-system/common/ncurses.xml"
     94    xpointer="xpointer(//*[@os='g'])"/>
    9395
    9496  </sect2>

  • BOOK/temp-system/common/patch.xml

    r8473983 rbc2e3fa  
    2323    <title>Installation of Patch</title>
    2424
    25     <para os="p1">This patch will add the ability to use DESTDIR:</para>
    26 
    27 <screen os="p2"><userinput>patch -Np1 -i ../&patch-destdir-patch;</userinput></screen>
    28 
    2925    <para os="a">Prepare Patch for compilation:</para>
    3026
    … …  
    3834    <para os="e">Install the package:</para>
    3935
    40 <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     36<screen os="f"><userinput>make install</userinput></screen>
    4137
    4238  </sect2>

  • BOOK/temp-system/common/sed.xml

    r8473983 rbc2e3fa  
    3434    <para os="e">Install the package:</para>
    3535
    36 <screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     36<screen os="f"><userinput>make install</userinput></screen>
    3737
    3838  </sect2>

  • BOOK/temp-system/common/tar.xml

    r8473983 rbc2e3fa  
    4242    xpointer="xpointer(//*[@os='f'])"/>
    4343
    44 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../../final-system/common/tar.xml"
     46    xpointer="xpointer(//*[@os='g'])"/>
    4547
    4648  </sect2>

  • BOOK/temp-system/common/texinfo.xml

    r8473983 rbc2e3fa  
    4242    xpointer="xpointer(//*[@os='f'])"/>
    4343
    44 <screen os="g"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     44    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    href="../../final-system/common/texinfo.xml"
     46    xpointer="xpointer(//*[@os='g'])"/>
    4547
    4648  </sect2>

  • BOOK/temp-system/common/zlib.xml

    r8473983 rbc2e3fa  
    2222  <sect2 role="installation">
    2323    <title>Installation of Zlib</title>
    24 
    25     <para os="p1">This patch will add the ability to use DESTDIR:</para>
    26 
    27 <screen os="p2"><userinput>patch -Np1 -i ../&zlib-destdir-patch;</userinput></screen>
    2824
    2925    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/temp-system/mips64/choose.xml

    r8473983 rbc2e3fa  
    2323    xpointer="xpointer(//*[@os='c'])"/>
    2424
    25 <screen><userinput>${CLFS}/tools/lib/&glibc-ld-name; ${CLFS}/tools/lib/libc.so.6
    26 ${CLFS}/tools/lib32/&glibc-ld-name; ${CLFS}/tools/lib32/libc.so.6
    27 ${CLFS}/tools/lib64/&glibc-ld-name; ${CLFS}/tools/lib64/libc.so.6
    28 ${CLFS}/tools/lib64/&glibc-ld-name; --library-path ${CLFS}/tools/lib64 \
    29     ${CLFS}/tools/bin/gcc -v</userinput></screen>
     25<screen ><userinput>/tools/lib/libc.so.6
     26/tools/lib32/libc.so.6
     27/tools/lib64/libc.so.6
     28/tools/bin/gcc -v</userinput></screen>
    3029
    3130    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/temp-system/multilib/bash.xml

    r8473983 rbc2e3fa  
    4444
    4545<screen os="h"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
    46    ./configure --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     46   ./configure --prefix=/tools \
     47   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    4748   --without-bash-malloc --cache-file=config.cache</userinput></screen>
    4849

  • BOOK/temp-system/multilib/choose.xml

    r8473983 rbc2e3fa  
    2323    xpointer="xpointer(//*[@os='c'])"/>
    2424
    25 <screen><userinput>${CLFS}/tools/lib/&glibc-ld-name; ${CLFS}/tools/lib/libc.so.6
    26 ${CLFS}/tools/lib64/&glibc-ld-name; ${CLFS}/tools/lib64/libc.so.6
    27 ${CLFS}/tools/lib64/&glibc-ld-name; --library-path ${CLFS}/tools/lib64 \
    28     ${CLFS}/tools/bin/gcc -v</userinput></screen>
     25<screen ><userinput>/tools/lib/libc.so.6
     26/tools/lib64/libc.so.6
     27/tools/bin/gcc -v</userinput></screen>
    2928
    3029  <para os="d">If any of these commands fail, you will have to follow the boot
    3130  method.</para>
     31
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/temp-system/multilib/gzip.xml

    r8473983 rbc2e3fa  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     29<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    3030  --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    3131

  • BOOK/temp-system/multilib/make.xml

    r8473983 rbc2e3fa  
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    45     href="../common/make.xml"
     45    href="../../final-system/common/make.xml"
    4646    xpointer="xpointer(//*[@os='g'])"/>
    4747

  • BOOK/temp-system/multilib/patch.xml

    r8473983 rbc2e3fa  
    2222  <sect2 role="installation">
    2323    <title>Installation of Patch</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    26     href="../common/patch.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    30     href="../common/patch.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/temp-system/multilib/zlib.xml

    r8473983 rbc2e3fa  
    2222  <sect2 role="installation">
    2323    <title>Installation of Zlib</title>
    24 
    25     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    26     href="../common/zlib.xml"
    27     xpointer="xpointer(//*[@os='p1'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    30     href="../common/zlib.xml"
    31     xpointer="xpointer(//*[@os='p2'])"/>
    3224
    3325    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/temp-system/sparc-chapter.xml

    r8473983 rbc2e3fa  
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
    3232  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
    33   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
    3433  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
    3534

  • BOOK/temp-system/x86/gcc.xml

    r8473983 rbc2e3fa  
    6666
    6767<screen os="cg"><userinput>cp -v gcc/Makefile.in{,.orig}
    68 sed -e "s@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 ${CLFS}/tools/include@g" \
     68sed -e 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g' \
    6969    gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
    7070
    … …  
    111111    <para os="co">Install the package:</para>
    112112
    113 <screen os="cp"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     113<screen os="cp"><userinput>make install</userinput></screen>
    114114
    115115    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    117117    xpointer="xpointer(//*[@os='w'])"/>
    118118
    119 <screen os="cq"><userinput>ln -sv gcc ${CLFS}/tools/bin/cc</userinput></screen>
     119<screen os="cq"><userinput>ln -sv gcc /tools/bin/cc</userinput></screen>
    120120
    121121  </sect2>

  • BOOK/temp-system/x86_64/gcc.xml

    r8473983 rbc2e3fa  
    7676
    7777<screen os="db"><userinput>cp -v gcc/Makefile.in{,.orig2}
    78 sed -e "/MULTILIBS/s@\$(GCC_FOR_TARGET)@${CLFS}/cross-tools/bin/${CC}@g" \
     78sed -e "/MULTILIBS/s@\$(GCC_FOR_TARGET)@/cross-tools/bin/${CC}@g" \
    7979   gcc/Makefile.in.orig2 > gcc/Makefile.in</userinput></screen>
    8080
Note: See TracChangeset for help on using the changeset viewer.