Changes in / [6fcaede:4261659]


Ignore:
Location:
BOOK
Files:
1 deleted
21 edited

Legend:

Unmodified
Added
Removed

  • BOOK/cross-tools/common/cloog-ppl.xml

    r6fcaede r4261659  
    3737<screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
    3838    ./configure --prefix=/cross-tools --enable-shared --with-bits=gmp \
    39     --with-gmp=/cross-tools --with-ppl=/cross-tools</userinput></screen>
     39        --with-gmp=/cross-tools --with-ppl=/cross-tools</userinput></screen>
    4040
    4141    <para os="c">Compile the package:</para>

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

    r6fcaede r4261659  
    3737<screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
    3838    ./configure --prefix=/cross-tools --enable-shared \
    39     --enable-interfaces="c,cxx" \
    40     --with-libgmp-prefix=/cross-tools \
    41     --with-libgmpxx-prefix=/cross-tools</userinput></screen>
     39        --enable-interfaces="c,cxx" \
     40        --with-libgmp-prefix=/cross-tools --with-libgmpxx-prefix=/cross-tools</userinput></screen>
    4241
    4342    <para os="c">Compile the package:</para>

  • BOOK/final-system/common/cloog-ppl.xml

    r6fcaede r4261659  
    3232
    3333<screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
    34     ./configure --prefix=/usr --enable-shared --with-gmp \
    35     --with-ppl</userinput></screen>
     34    ./configure --prefix=/usr --enable-shared --with-gmp=/usr \
     35        --with-ppl=/usr</userinput></screen>
    3636
    3737    <para os="c">Compile the package:</para>

  • BOOK/final-system/common/iproute2.xml

    r6fcaede r4261659  
    3838    <para os="a">Compile the package:</para>
    3939
    40 <screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
     40<screen os="b"><userinput>make DESTDIR=/ DOCDIR=/usr/share/doc/iproute2 \
    4141    MANDIR=/usr/share/man</userinput></screen>
    4242
    … …  
    4545
    4646      <varlistentry>
    47         <term><parameter>DESTDIR=</parameter></term>
     47        <term><parameter>DESTDIR=/</parameter></term>
    4848        <listitem>
    4949          <para>This option overrides the default DESTDIR of /usr, so that
    … …  
    6969    <para os="e">Install the package:</para>
    7070
    71 <screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
     71<screen os="f"><userinput>make DOCDIR=/usr/share/doc/iproute2 \
    7272    MANDIR=/usr/share/man install</userinput></screen>
    7373

  • BOOK/final-system/common/ppl.xml

    r6fcaede r4261659  
    3030    <para os="a">Prepare PPL for compilation:</para>
    3131
    32 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
    33     CXX="g++ -isystem /usr/include" \
    34     LDFLAGS="-Wl,-rpath-link,/lib" \
    35     ./configure --prefix=/usr --enable-shared</userinput></screen>
     32<screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
     33    ./configure --prefix=/usr --enable-shared --with-libgmp-prefix=/usr \
     34    --with-libgmpxx-prefix=/usr</userinput></screen>
    3635
    3736    <para os="c">Compile the package:</para>

  • BOOK/final-system/mips64-chapter.xml

    r6fcaede r4261659  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ppl.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ppl-n32.xml"/>
    32   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/ppl-64bit.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ppl-64bit.xml"/>
    3333  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/cloog-ppl.xml"/>
    3434  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/cloog-ppl-n32.xml"/>

  • BOOK/final-system/multilib/cloog-ppl-64bit.xml

    r6fcaede r4261659  
    3838<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    3939    LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" ./configure --prefix=/usr \
    40     --libdir=/usr/lib64 --enable-shared --with-gmp \
    41     --with-ppl</userinput></screen>
     40        --libdir=/usr/lib64 --enable-shared --with-gmp=/usr \
     41    --with-ppl=/usr</userinput></screen>
    4242
    4343    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/final-system/multilib/cloog-ppl-n32.xml

    r6fcaede r4261659  
    3737    xpointer="xpointer(//*[@os='a'])"/>
    3838
    39 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDM32}" \
     39<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
    4040    LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \
    41     --libdir=/usr/lib32 --enable-shared --with-gmp \
    42     --with-ppl</userinput></screen>
     41        --libdir=/usr/lib32 --enable-shared \
     42    --with-libgmp-prefix=/usr --with-libgmpxx-prefix=/usr</userinput></screen>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/final-system/multilib/cloog-ppl.xml

    r6fcaede r4261659  
    3939<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    4040    LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" ./configure --prefix=/usr \
    41     --host=${CLFS_TARGET32} --enable-shared \
    42     --with-gmp --with-ppl</userinput></screen>
     41        --host=${CLFS_TARGET32} --enable-shared \
     42    --with-gmp=/usr --with-ppl=/usr</userinput></screen>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/final-system/multilib/iproute2.xml

    r6fcaede r4261659  
    3838    xpointer="xpointer(//*[@os='a'])"/>
    3939
    40 <screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= LIBDIR=/usr/lib64 \
     40<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR=/ LIBDIR=/usr/lib64 \
    4141    DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</userinput></screen>
    4242
    … …  
    5353    xpointer="xpointer(//*[@os='e'])"/>
    5454
    55 <screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
     55<screen os="f"><userinput>make LIBDIR=/usr/lib64 \
    5656    DOCDIR=/usr/share/doc/iproute2 \
    5757    MANDIR=/usr/share/man install</userinput></screen>

  • BOOK/final-system/multilib/ppl-64bit.xml

    r6fcaede r4261659  
    3636    xpointer="xpointer(//*[@os='a'])"/>
    3737
    38 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD64}" \
    39     CXX="g++ -isystem /usr/include ${BUILD64}" \
    40     LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" \
    41     ./configure --prefix=/usr \
    42     --libdir=/usr/lib64 --enable-shared</userinput></screen>
     38<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
     39    LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" ./configure --prefix=/usr \
     40        --libdir=/usr/lib64 --enable-shared \
     41    --with-libgmp-prefix=/usr --with-libgmpxx-prefix=/usr</userinput></screen>
    4342
    4443    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    7069    xpointer="xpointer(//*[@os='i'])"/>
    7170
    72     <para os="m1">Prepare <filename>ppl-config</filename> to be wrapped by
    73     the multiarch wrapper and then wrap it:</para>
    74 
    75 <screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-64}
    76 ln -svf multiarch_wrapper /usr/bin/ppl-config</userinput></screen>
    77 
    78     <para os="j">Create the 64bit header file:</para>
    79 
    80 <screen os="k"><userinput>mv -v /usr/include/ppl{,-64}.hh</userinput></screen>
    81 
    82     <para os="l">Finally, create a stub header in the place of the originals:</para>
    83 
    84 <screen os="m"><userinput>cat &gt; /usr/include/ppl.hh &lt;&lt; "EOF"
    85 /* ppl.hh - Stub Header  */
    86 #ifndef __STUB__PPL_HH__
    87 #define __STUB__PPL_HH__
    88 
    89 #if defined(__x86_64__) || \
    90     defined(__sparc64__) || \
    91     defined(__arch64__) || \
    92     defined(__powerpc64__) || \
    93     defined (__s390x__)
    94 # include "ppl-64.h"
    95 #else
    96 # include "ppl-32.h"
    97 #endif
    98 
    99 #endif /* __STUB__PPL_HH__ */
    100 EOF</userinput></screen>
    101 
    10271  </sect2>
    10372

  • BOOK/final-system/multilib/ppl-n32.xml

    r6fcaede r4261659  
    3737    xpointer="xpointer(//*[@os='a'])"/>
    3838
    39 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \
    40     CXX="g++ -isystem /usr/include ${BUILDN32}" \
    41     LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \
    42     ./configure --prefix=/usr \
    43     --libdir=/usr/lib32 --enable-shared</userinput></screen>
     39<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
     40    LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \
     41        --libdir=/usr/lib32 --enable-shared --with-libgmp-prefix=/usr \
     42    --with-libgmpxx-prefix=/usr</userinput></screen>
    4443
    4544    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    7170    xpointer="xpointer(//*[@os='i'])"/>
    7271
    73     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    74     href="ppl.xml"
    75     xpointer="xpointer(//*[@os='m1'])"/>
    76 
    77 <screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-n32}</userinput></screen>
    78 
    79     <para os="j">Create the N32 header file:</para>
    80 
    81 <screen os="k"><userinput>mv -v /usr/include/ppl{,-n32}.hh</userinput></screen>
    82 
    8372  </sect2>
    8473

  • BOOK/final-system/multilib/ppl.xml

    r6fcaede r4261659  
    3737    xpointer="xpointer(//*[@os='a'])"/>
    3838
    39 <screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \
    40     CXX="g++ -isystem /usr/include ${BUILD32}" \
     39<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    4140    LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \
    42     ./configure --prefix=/usr --host=${CLFS_TARGET32} \
    43     --enable-shared</userinput></screen>
     41        ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared \
     42        --with-libgmp-prefix=/usr --with-libgmpxx-prefix=/usr</userinput></screen>
    4443
    4544    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    … …  
    7170    xpointer="xpointer(//*[@os='i'])"/>
    7271
    73     <para os="m1">Prepare <filename>ppl-config</filename> to be wrapped by
    74     the multiarch wrapper:</para>
    75 
    76 <screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-32}</userinput></screen>
    77 
    78     <para os="j">One of the headers installed by PPL is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of PPL. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
    79 
    80 <screen os="k"><userinput>mv -v /usr/include/ppl{,-32}.hh</userinput></screen>
    81 
    82 
    8372  </sect2>
    8473

  • BOOK/patches.ent

    r6fcaede r4261659  
    11<?xml version="1.0" encoding="ISO-8859-1"?>
    22
    3 <!ENTITY patches-root "http://cross-lfs.org/files/packages/svn/">
     3<!ENTITY patches-root "http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/">
    44
    55<!-- Start of Common Patches -->

  • BOOK/temp-system/64/cloog-ppl.xml

    r6fcaede r4261659  
    3838
    3939<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    40     --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
    41     --enable-shared --with-gmp=/tools --with-ppl=/tools</userinput></screen>
     40  --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
     41  --enable-shared --with-gmp=/tools --with-ppl=/tools</userinput></screen>
    4242
    4343    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

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

    r6fcaede r4261659  
    123123    xpointer="xpointer(//*[@os='cp'])"/>
    124124
     125   <para os="dp">Now we copy the files that are placed in <filename class="directory">/tools/lib64
     126   </filename> to <filename class="directory">/tools/lib</filename>.
     127    We also delete the /tools/lib64 directory:</para>
     128
     129<screen os="dq"><userinput>cp -va /tools/lib64/* /tools/lib
     130rm -rvf /tools/lib64</userinput></screen>
     131
    125132  </sect2>
    126133

  • BOOK/temp-system/common/cloog-ppl.xml

    r6fcaede r4261659  
    3636
    3737<screen os="b"><userinput>./configure --prefix=/tools \
    38     --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
    39     --with-ppl=/tools --with-gmp=/tools</userinput></screen>
     38  --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
     39  --with-ppl=/tools --with-gmp=/tools</userinput></screen>
    4040
    4141    <para os="c">Compile the package:</para>

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

    r6fcaede r4261659  
    9898    </variablelist>
    9999
    100     <para os="ts1">The following will prevent GCC from looking in the wrong
    101     directories for headers and libraries:</para>
     100    <para os="ts1">When gcc was configured it was told to find MPFR, GMP, PPL,
     101    and CLooG-PPL in /tools. However, when compiling gcc uses these same values
     102    for building native helper programs that run on the host. The following sed
     103    will change those values to look in cross-tools for the native programs
     104    only:</para>
    102105
    103106<screen os="ts2"><userinput>cp Makefile{,.orig}

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

    r6fcaede r4261659  
    3737<screen os="b"><userinput>./configure --prefix=/tools \
    3838    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    39     --enable-interfaces="c,cxx" \
    40     --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools</userinput></screen>
     39     --enable-interfaces="c,cxx" \
     40        --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools</userinput></screen>
    4141
    4242    <para os="bp1">PPL doesn't check to see if GMP was compiled with support for

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

    r6fcaede r4261659  
    3939<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    4040    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    41     --enable-interfaces="c,cxx" --libdir=/tools/lib64 --enable-shared \
    42     --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools</userinput></screen>
     41      --enable-interfaces="c,cxx" --libdir=/tools/lib64 --enable-shared \
     42      --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools</userinput></screen>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

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

    r6fcaede r4261659  
    3838  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
    3939  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
     40  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/choose.xml"/>
    4041  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
    41   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/choose.xml"/>
    4242
    4343</chapter>
Note: See TracChangeset for help on using the changeset viewer.