Ignore:
Timestamp:
Apr 16, 2011, 5:46:52 PM (15 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
441840b
Parents:
af43a09 (diff), e0ad6ee (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 simp

Location:
BOOK/final-system/mips64
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/mips64/binutils.xml

    raf43a09 r2643b9b4  
    5555
    5656<screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    57     LDFLAGS="-Wl,-rpath-link,/lib64:/lib32:/lib ${BUILD64}" \
    58     ../binutils-&binutils-version;/configure --prefix=/usr \
     57LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib ${BUILD64}" \
     58  ../binutils-&binutils-version;/configure --prefix=/usr \
    5959    --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>
    6060

  • BOOK/final-system/mips64/eglibc-64bit.xml

    raf43a09 r2643b9b4  
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/eglibc.xml"
     34    xpointer="xpointer(//*[@os='l2'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2937    href="../multilib/eglibc-64bit.xml"
    3038    xpointer="xpointer(//*[@os='l4'])"/>
     39
     40    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     41    href="../common/eglibc.xml"
     42    xpointer="xpointer(//*[@os='p1'])"/>
     43
     44    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/eglibc.xml"
     46    xpointer="xpointer(//*[@os='p2'])"/>
    3147
    3248    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/mips64/eglibc-n32.xml

    raf43a09 r2643b9b4  
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/eglibc.xml"
     26    xpointer="xpointer(//*[@os='l1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/eglibc.xml"
     30    xpointer="xpointer(//*[@os='l2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/eglibc.xml"
    2634    xpointer="xpointer(//*[@os='l3'])"/>
    2735
    28 <screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib32/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
     36<screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
    2937sed -i "s|libs -o|libs -L/usr/lib32 -Wl,-dynamic-linker=${LINKER} -o|" \
    3038  scripts/test-installation.pl
    3139unset LINKER</userinput></screen>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     42    href="../common/eglibc.xml"
     43    xpointer="xpointer(//*[@os='p1'])"/>
     44
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     46    href="../common/eglibc.xml"
     47    xpointer="xpointer(//*[@os='p2'])"/>
    3248
    3349    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/mips64/eglibc.xml

    raf43a09 r2643b9b4  
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3030    href="../common/eglibc.xml"
     31    xpointer="xpointer(//*[@os='l1'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/eglibc.xml"
     35    xpointer="xpointer(//*[@os='l2'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/eglibc.xml"
    3139    xpointer="xpointer(//*[@os='l3'])"/>
    3240
    … …  
    3442    href="../common/eglibc.xml"
    3543    xpointer="xpointer(//*[@os='l4'])"/>
     44
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     46    href="../common/eglibc.xml"
     47    xpointer="xpointer(//*[@os='p1'])"/>
     48
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     50    href="../common/eglibc.xml"
     51    xpointer="xpointer(//*[@os='p2'])"/>
    3652
    3753    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/mips64/gcc.xml

    raf43a09 r2643b9b4  
    4242    xpointer="xpointer(//*[@os='h'])"/>
    4343
    44 <screen os="i"><userinput>CC="gcc -Wl,-rpath-link,/lib64:/lib32:/lib -isystem /usr/include ${BUILD64}" \
    45     CXX="g++ -Wl,-rpath-link,/lib64:/lib32:/lib -isystem /usr/include ${BUILD64}" \
    46     ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
     44<screen os="i"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
     45CXX="g++ -isystem /usr/include ${BUILD64}" \
     46LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/usr/lib32:/lib32:/usr/lib:/lib" \
     47  ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
    4748    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
    4849    --enable-__cxa_atexit --enable-c99 --enable-long-long --with-abi=64 \
Note: See TracChangeset for help on using the changeset viewer.