Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (12 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

Location:
BOOK/temp-system/64
Files:
1 added
5 edited
2 moved

Legend:

Unmodified
Added
Removed

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

    rec008670 r229ed25  
    2323    <title>Installation of Binutils</title>
    2424
     25<!-- Branch update patch area
     26    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     27    href="../../final-system/common/binutils.xml"
     28    xpointer="xpointer(//*[@os='p1'])"/>
     29
     30    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     31    href="../../final-system/common/binutils.xml"
     32    xpointer="xpointer(//*[@os='p2'])"/>
     33-->
    2534    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2635    href="../common/binutils.xml"
    … …  
    3544    xpointer="xpointer(//*[@os='i'])"/>
    3645
    37 <screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-version;/configure \
     46<screen os="j"><userinput>CC="${CC} ${BUILD64}" ../binutils-&binutils-dir;/configure \
    3847    --prefix=/tools --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    3948    --target=${CLFS_TARGET} --with-lib-path=/tools/lib --disable-nls \

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

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-temp-system-cloog-ppl" role="wrap">
    9   <?dbhtml filename="cloog-ppl.html"?>
     8<sect1 id="ch-temp-system-cloog" role="wrap">
     9  <?dbhtml filename="cloog.html"?>
    1010
    11   <title>CLooG-PPL-&cloog-ppl-version;</title>
     11  <title>CLooG-&cloog-version;</title>
    1212
    13   <indexterm zone="ch-temp-system-cloog-ppl">
    14     <primary sortas="a-MPFR">CLooG-PPL</primary>
     13  <indexterm zone="ch-temp-system-cloog">
     14    <primary sortas="a-MPFR">CLooG</primary>
    1515    <secondary>temporary system</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../../final-system/common/cloog-ppl.xml"
     19  href="../../final-system/common/cloog.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of CLooG-PPL</title>
     23    <title>Installation of CLooG</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/cloog-ppl.xml"
     26    href="../common/cloog.xml"
     27    xpointer="xpointer(//*[@os='a'])"/>
     28
     29<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     30    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     31    --enable-shared --with-gmp-prefix=/tools --with-isl-prefix=/tools</userinput></screen>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../../final-system/common/cloog.xml"
    2735    xpointer="xpointer(//*[@os='s1'])"/>
    2836
    2937    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/cloog-ppl.xml"
     38    href="../../final-system/common/cloog.xml"
    3139    xpointer="xpointer(//*[@os='s2'])"/>
    3240
    3341    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/cloog-ppl.xml"
    35     xpointer="xpointer(//*[@os='a'])"/>
    36 
    37 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    38     --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
    39     --enable-shared --with-gmp=/tools --with-ppl=/tools</userinput></screen>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/cloog-ppl.xml"
     42    href="../common/cloog.xml"
    4343    xpointer="xpointer(//*[@os='c'])"/>
    4444
    4545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/cloog-ppl.xml"
     46    href="../common/cloog.xml"
    4747    xpointer="xpointer(//*[@os='d'])"/>
    4848       
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/cloog-ppl.xml"
     50    href="../common/cloog.xml"
    5151    xpointer="xpointer(//*[@os='e'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../common/cloog-ppl.xml"
     54    href="../common/cloog.xml"
    5555    xpointer="xpointer(//*[@os='f'])"/>
    5656
    … …  
    6161
    6262    <para>Details on this package are located in <xref
    63     linkend="contents-cloog-ppl" role="."/></para>
     63    linkend="contents-cloog" role="."/></para>
    6464
    6565  </sect2>

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

    rec008670 r229ed25  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../../cross-tools/64/gcc-static.xml"
     26    href="../../final-system/common/gcc.xml"
    2727    xpointer="xpointer(//*[@os='p1'])"/>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../../cross-tools/64/gcc-static.xml"
     30    href="../../final-system/common/gcc.xml"
    3131    xpointer="xpointer(//*[@os='p2'])"/>
    3232
    … …  
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/gcc.xml"
    51     xpointer="xpointer(//*[@os='cf'])"/>
     50    href="../../final-system/common/gcc.xml"
     51    xpointer="xpointer(//*[@os='fix1'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../common/gcc.xml"
    55     xpointer="xpointer(//*[@os='cg'])"/>
     54    href="../../final-system/common/gcc.xml"
     55    xpointer="xpointer(//*[@os='fix2'])"/>
    5656
    5757    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    7676    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
    7777    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
    78     --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
     78    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch \
     79    --enable-cloog-backend=isl --with-gmp=/tools --with-mpfr=/tools \
     80    --with-mpc=/tools --with-isl=/tools --disable-isl-version-check \
     81    --with-cloog=/tools --with-system-zlib \
     82    --with-native-system-header-dir=/tools/include --enable-checking=release \
     83    --enable-libstdcxx-time</userinput></screen>
    7984
    8085    <variablelist>
    … …  
    9398    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9499    href="../common/gcc.xml"
    95     xpointer="xpointer(//*[@os='ts1'])"/>
     100    xpointer="xpointer(//*[@os='s1'])"/>
    96101
    97102    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    98103    href="../common/gcc.xml"
    99     xpointer="xpointer(//*[@os='ts2'])"/>
     104    xpointer="xpointer(//*[@os='s2'])"/>
    100105
    101106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    rec008670 r229ed25  
    3737    xpointer="xpointer(//*[@os='a'])"/>
    3838
    39 <screen os="b"><userinput>HOST_CC=gcc CPPFLAGS=-fexceptions CC="${CC} ${BUILD64}" \
     39<screen os="b"><userinput>HOST_CC=gcc CC="${CC} ${BUILD64}" \
    4040    CXX="${CXX} ${BUILD64}" ./configure --prefix=/tools \
    4141    --build=${CLFS_HOST} --host=${CLFS_TARGET} \

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

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-glib-32" role="wrap">
    9   <?dbhtml filename="glib.html"?>
     8<sect1 id="ch-temp-system-isl" role="wrap">
     9  <?dbhtml filename="isl.html"?>
    1010
    11   <title>Glib-&glib-version; 32 Bit Libraries</title>
     11  <title>ISL-&isl-version;</title>
    1212
    13   <indexterm zone="ch-system-glib-32">
    14     <primary sortas="a-Glib">Glib</primary>
    15     <secondary>32 Bit</secondary>
     13  <indexterm zone="ch-temp-system-isl">
     14    <primary sortas="a-ISL">ISL</primary>
     15    <secondary>temporary system</secondary>
    1616  </indexterm>
    1717
    1818  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    19   href="../common/glib.xml"
     19  href="../../final-system/common/isl.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    2121
    2222  <sect2 role="installation">
    23     <title>Installation of Glib</title>
     23    <title>Installation of ISL</title>
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    26     href="../common/glib.xml"
     26    href="../common/isl.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
     29<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
     30  ./configure --prefix=/tools \
     31    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     32    --with-gmp-prefix=/tools</userinput></screen>
    3033
    3134    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    32     href="../common/glib.xml"
     35    href="../common/isl.xml"
    3336    xpointer="xpointer(//*[@os='c'])"/>
    3437
    3538    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    36     href="../common/glib.xml"
     39    href="../common/isl.xml"
    3740    xpointer="xpointer(//*[@os='d'])"/>
    38 
     41       
    3942    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="../common/glib.xml"
     43    href="../common/isl.xml"
    4144    xpointer="xpointer(//*[@os='e'])"/>
    4245
    4346    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="../common/glib.xml"
     47    href="../common/isl.xml"
    4548    xpointer="xpointer(//*[@os='f'])"/>
    46 
    47     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/glib.xml"
    49     xpointer="xpointer(//*[@os='g'])"/>
    5049
    5150  </sect2>
    … …  
    5554
    5655    <para>Details on this package are located in <xref
    57     linkend="contents-glib" role="."/></para>
     56    linkend="contents-isl" role="."/></para>
    5857
    5958  </sect2>

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

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

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

    rec008670 r229ed25  
    2222  <sect2 role="installation">
    2323    <title>Installation of MPFR</title>
     24
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../../final-system/common/mpfr.xml"
     27    xpointer="xpointer(//*[@os='p1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../../final-system/common/mpfr.xml"
     31    xpointer="xpointer(//*[@os='p2'])"/>
    2432
    2533    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.