Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 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

File:
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/temp-system/multilib/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-CLooG-PPL">CLooG-PPL</primary>
     13  <indexterm zone="ch-temp-system-cloog">
     14    <primary sortas="a-CLooG">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}  --libdir=/tools/lib64 \
     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     --libdir=/tools/lib64 --enable-shared \
    40     --with-gmp=/tools --with-ppl=/tools</userinput></screen>
    41 
    42     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    43     href="../common/cloog-ppl.xml"
     42    href="../common/cloog.xml"
    4443    xpointer="xpointer(//*[@os='c'])"/>
    4544
    4645    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    47     href="../common/cloog-ppl.xml"
     46    href="../common/cloog.xml"
    4847    xpointer="xpointer(//*[@os='d'])"/>
    4948       
    5049    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    51     href="../common/cloog-ppl.xml"
     50    href="../common/cloog.xml"
    5251    xpointer="xpointer(//*[@os='e'])"/>
    5352
    5453    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    55     href="../common/cloog-ppl.xml"
     54    href="../common/cloog.xml"
    5655    xpointer="xpointer(//*[@os='f'])"/>
    5756
    … …  
    6261
    6362    <para>Details on this package are located in <xref
    64     linkend="contents-cloog-ppl" role="."/></para>
     63    linkend="contents-cloog" role="."/></para>
    6564
    6665  </sect2>
Note: See TracChangeset for help on using the changeset viewer.