Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 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

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r88ef769 r03e6a40  
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/bison.xml"
    27     xpointer="xpointer(//*[@os='t3'])"/>
    28 
    29     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    30     href="../common/bison.xml"
    31     xpointer="xpointer(//*[@os='t4'])"/>
    32 
    33     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    34     href="../common/bison.xml"
    3527    xpointer="xpointer(//*[@os='a'])"/>
    3628
    37 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr  --cache-file=config.cache</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" M4=m4 \
     30    ./configure --prefix=/usr</userinput></screen>
    3831
    3932    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.