Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (12 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

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

Legend:

Unmodified
Added
Removed

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

    r88ef769 r03e6a40  
    5050
    5151    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="../multilib/binutils.xml"
    53     xpointer="xpointer(//*[@os='ea'])"/>
    54 
    55     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5652    href="../common/binutils.xml"
    5753    xpointer="xpointer(//*[@os='be'])"/>

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

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-testsuite-tools-check" role="wrap">
     8<sect1 id="ch-temp-system-check" role="wrap">
    99  <?dbhtml filename="check.html"?>
    1010
    1111  <title>Check-&check-version;</title>
    1212
    13   <indexterm zone="ch-testsuite-tools-check">
     13  <indexterm zone="ch-temp-system-check">
    1414    <primary sortas="a-Check">Check</primary>
    1515  </indexterm>
    … …  
    2828<screen os="d"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
    2929    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
     30
     31    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     32    href="../common/check.xml"
     33    xpointer="xpointer(//*[@os='e'])"/>
    3034
    3135    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r88ef769 r03e6a40  
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../../final-system/common/cloog.xml"
     35    xpointer="xpointer(//*[@os='s1'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../../final-system/common/cloog.xml"
     39    xpointer="xpointer(//*[@os='s2'])"/>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3442    href="../common/cloog.xml"
    3543    xpointer="xpointer(//*[@os='c'])"/>

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

    r88ef769 r03e6a40  
    7777    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
    7878    --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 \
     79    --with-gmp=/tools --with-mpfr=/tools --with-mpc=/tools --with-isl=/tools \
    8180    --with-cloog=/tools --with-system-zlib \
    8281    --with-native-system-header-dir=/tools/include --enable-checking=release \

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

    r88ef769 r03e6a40  
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../multilib/gmp.xml"
     46    xpointer="xpointer(//*[@os='ba'])"/>
     47
     48    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4549    href="../common/gmp.xml"
    4650    xpointer="xpointer(//*[@os='c'])"/>

  • BOOK/temp-system/64/util-linux.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-chroot-util-linux" role="wrap">
     8<sect1 id="ch-temp-system-util-linux" role="wrap">
    99  <?dbhtml filename="util-linux.html"?>
    1010
    1111  <title>Util-linux-&util-linux-version;</title>
    1212
    13   <indexterm zone="ch-chroot-util-linux">
     13  <indexterm zone="ch-temp-system-util-linux">
    1414    <primary sortas="a-Util-linux">Util-linux</primary>
    15     <secondary>chroot</secondary>
     15    <secondary>temporary system</secondary>
    1616  </indexterm>
    1717
    … …  
    2929<screen os="be"><userinput>CC="${CC} ${BUILD64}" PKG_CONFIG= ./configure --prefix=/tools \
    3030    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    31     --disable-makeinstall-chown --disable-login --disable-su</userinput></screen>
     31    --disable-makeinstall-chown --disable-makeinstall-setuid</userinput></screen>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/util-linux.xml"
     35    xpointer="xpointer(//*[@os='c'])"/>
    3236
    3337    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.