Ignore:
Timestamp:
Jul 7, 2009, 8:49:42 AM (11 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
b26d64d
Parents:
4261659 (diff), 53750600 (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' of git@…:cross-lfs

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/multilib/ppl-n32.xml

    r4261659 r6fcaede  
    3737    xpointer="xpointer(//*[@os='a'])"/>
    3838
    39 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
    40     LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \
    41         --libdir=/usr/lib32 --enable-shared --with-libgmp-prefix=/usr \
    42     --with-libgmpxx-prefix=/usr</userinput></screen>
     39<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \
     40    CXX="g++ -isystem /usr/include ${BUILDN32}" \
     41    LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \
     42    ./configure --prefix=/usr \
     43    --libdir=/usr/lib32 --enable-shared</userinput></screen>
    4344
    4445    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    7071    xpointer="xpointer(//*[@os='i'])"/>
    7172
     73    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     74    href="ppl.xml"
     75    xpointer="xpointer(//*[@os='m1'])"/>
     76
     77<screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-n32}</userinput></screen>
     78
     79    <para os="j">Create the N32 header file:</para>
     80
     81<screen os="k"><userinput>mv -v /usr/include/ppl{,-n32}.hh</userinput></screen>
     82
    7283  </sect2>
    7384
Note: See TracChangeset for help on using the changeset viewer.