Ignore:
Timestamp:
Feb 3, 2014, 3:21:44 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
4340580
Parents:
849369d (diff), 961afdcd (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' of git.cross-lfs.org:cross-lfs into systemd

Location:
BOOK/final-system/multilib
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r849369d r43100c0  
    2929    href="bzip2.xml"
    3030    xpointer="xpointer(//*[@os='s2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/bzip2.xml"
     34    xpointer="xpointer(//*[@os='s3'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/bzip2.xml"
     38    xpointer="xpointer(//*[@os='s4'])"/>
    3139
    3240    <para os="m1">We need to change the default lib path

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

    r849369d r43100c0  
    3030    href="bzip2.xml"
    3131    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/bzip2.xml"
     35    xpointer="xpointer(//*[@os='s3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/bzip2.xml"
     39    xpointer="xpointer(//*[@os='s4'])"/>
    3240
    3341    <para os="m1">We need to change the default lib path

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

    r849369d r43100c0  
    3030    href="../common/bzip2.xml"
    3131    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/bzip2.xml"
     35    xpointer="xpointer(//*[@os='s3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/bzip2.xml"
     39    xpointer="xpointer(//*[@os='s4'])"/>
    3240
    3341    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2121  <sect2 role="installation">
    2222    <title>Installation of Diffutils</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/diffutils.xml"
     26    xpointer="xpointer(//*[@os='s1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/diffutils.xml"
     30    xpointer="xpointer(//*[@os='s2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    29     --libdir=/usr/lib64</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
     29    --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    3030
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4040    href="../common/expat.xml"
    4141    xpointer="xpointer(//*[@os='e'])"/>
     42
     43  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     44    href="../common/expat.xml"
     45    xpointer="xpointer(//*[@os='e2'])"/>
    4246
    4347  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    30     --libdir=/usr/lib32</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
     30    ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    3131
    3232  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4141    href="../common/expat.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
     43
     44  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/expat.xml"
     46    xpointer="xpointer(//*[@os='e2'])"/>
    4347
    4448  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
    30     --libdir=/usr/lib</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure \
     30    --prefix=/usr --libdir=/usr/lib</userinput></screen>
    3131
    3232  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4141    href="../common/expat.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
     43
     44  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/expat.xml"
     46    xpointer="xpointer(//*[@os='e2'])"/>
    4347
    4448  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.