Ignore:
Timestamp:
Apr 16, 2011, 5:47:06 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
9793117
Parents:
6cefbfb (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 systemd

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

Legend:

Unmodified
Added
Removed

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

    r6cefbfb r21e442f  
    5555
    5656<screen os="ca"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    57     LDFLAGS="-Wl,-rpath-link,/lib64:/lib ${BUILD64}" \
    58     ../binutils-&binutils-version;/configure --prefix=/usr \
     57LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64:/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/multilib/cloog-ppl-64bit.xml

    r6cefbfb r21e442f  
    2727
    2828<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    29     LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" ./configure --prefix=/usr \
     29LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
     30  ./configure --prefix=/usr \
    3031    --libdir=/usr/lib64 --enable-shared --with-gmp \
    3132    --with-ppl</userinput></screen>

  • BOOK/final-system/multilib/cloog-ppl-n32.xml

    r6cefbfb r21e442f  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDM32}" \
    30     LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \
     29<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
     30LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
     31  ./configure --prefix=/usr \
    3132    --libdir=/usr/lib32 --enable-shared --with-gmp \
    3233    --with-ppl</userinput></screen>

  • BOOK/final-system/multilib/cloog-ppl.xml

    r6cefbfb r21e442f  
    2828
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    30     LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" ./configure --prefix=/usr \
     30LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
     31  ./configure --prefix=/usr \
    3132    --host=${CLFS_TARGET32} --enable-shared \
    3233    --with-gmp --with-ppl</userinput></screen>

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

    r6cefbfb r21e442f  
    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/lib64/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/lib64 -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/multilib/eglibc.xml

    r6cefbfb r21e442f  
    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/multilib/gcc.xml

    r6cefbfb r21e442f  
    4242    xpointer="xpointer(//*[@os='h'])"/>
    4343
    44 <screen os="i"><userinput>CC="gcc -Wl,-rpath-link,/lib64:/lib -isystem /usr/include ${BUILD64}" \
    45     CXX="g++ -Wl,-rpath-link,/lib64:/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/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 \

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

    r6cefbfb r21e442f  
    4141
    4242<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD64}" \
    43     CXX="g++ -isystem /usr/include ${BUILD64}" \
    44     LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" ./configure --prefix=/usr \
     43CXX="g++ -isystem /usr/include ${BUILD64}" \
     44LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
     45  ./configure --prefix=/usr \
    4546    --libdir=/usr/lib64 --enable-cxx --enable-mpbsd</userinput></screen>
    4647

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

    r6cefbfb r21e442f  
    4343
    4444<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \
    45     CXX="g++ -isystem /usr/include ${BUILDN32}" \
    46     LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ABI=n32 \
    47     ./configure --prefix=/usr \
     45CXX="g++ -isystem /usr/include ${BUILDN32}" \
     46LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
     47  ABI=n32 ./configure --prefix=/usr \
    4848    --libdir=/usr/lib32 --enable-cxx --enable-mpbsd</userinput></screen>
    4949

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

    r6cefbfb r21e442f  
    4242
    4343<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \
    44     CXX="g++ -isystem /usr/include ${BUILD32}" \
    45     LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" ABI=32 \
    46     ./configure --prefix=/usr \
     44CXX="g++ -isystem /usr/include ${BUILD32}" \
     45LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
     46  ABI=32 ./configure --prefix=/usr \
    4747    -enable-cxx --enable-mpbsd</userinput></screen>
    4848

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

    r6cefbfb r21e442f  
    2727
    2828<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    29 LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" EGREP="grep -E" \
    30 ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
     29LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
     30  EGREP="grep -E" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r6cefbfb r21e442f  
    2828
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
    30 LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" EGREP="grep -E" \
    31 ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
     30LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
     31  EGREP="grep -E" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r6cefbfb r21e442f  
    2828
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    30 LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" EGREP="grep -E" \
    31 ./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
     30LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
     31  EGREP="grep -E" ./configure --prefix=/usr --host=${CLFS_TARGET32}</userinput></screen>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r6cefbfb r21e442f  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" \
    29     ./configure --prefix=/usr --libdir=/usr/lib64 --enable-shared</userinput></screen>
     28<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
     29LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
     30  ./configure --prefix=/usr --libdir=/usr/lib64 --enable-shared</userinput></screen>
    3031
    3132    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r6cefbfb r21e442f  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \
    30     ./configure --prefix=/usr --libdir=/usr/lib32 --enable-shared</userinput></screen>
     29<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
     30LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
     31  ./configure --prefix=/usr --libdir=/usr/lib32 --enable-shared</userinput></screen>
    3132
    3233    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r6cefbfb r21e442f  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \
    30     ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared</userinput></screen>
     29<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
     30LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
     31  ./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared</userinput></screen>
    3132
    3233    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r6cefbfb r21e442f  
    2727
    2828<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD64}" \
    29     CXX="g++ -isystem /usr/include ${BUILD64}" \
    30     LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" \
    31     ./configure --prefix=/usr --libdir=/usr/lib64 \
    32       --enable-shared --disable-optimization</userinput></screen>
     29CXX="g++ -isystem /usr/include ${BUILD64}" \
     30LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
     31  ./configure --prefix=/usr --libdir=/usr/lib64 \
     32    --enable-shared --disable-optimization</userinput></screen>
    3333
    3434    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r6cefbfb r21e442f  
    2828
    2929<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \
    30     CXX="g++ -isystem /usr/include ${BUILDN32}" \
    31     LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \
    32     ./configure --prefix=/usr --libdir=/usr/lib32 \
    33       --enable-shared --disable-optimization</userinput></screen>
     30CXX="g++ -isystem /usr/include ${BUILDN32}" \
     31LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
     32  ./configure --prefix=/usr --libdir=/usr/lib32 \
     33    --enable-shared --disable-optimization</userinput></screen>
    3434
    3535    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r6cefbfb r21e442f  
    2828
    2929<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \
    30     CXX="g++ -isystem /usr/include ${BUILD32}" \
    31     LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \
    32     ./configure --prefix=/usr --host=${CLFS_TARGET32} \
    33       --enable-shared --disable-optimization</userinput></screen>
     30CXX="g++ -isystem /usr/include ${BUILD32}" \
     31LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
     32  ./configure --prefix=/usr --host=${CLFS_TARGET32} \
     33    --enable-shared --disable-optimization</userinput></screen>
    3434
    3535    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r6cefbfb r21e442f  
    2727
    2828<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
    29     CXX="g++ -isystem /usr/include ${BUILD64}" \
    30     LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" \
    31     ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
     29CXX="g++ -isystem /usr/include ${BUILD64}" \
     30LDFLAGS="-Wl,-rpath-link,/usr/lib64:/lib64 ${BUILD64}" \
     31  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    3232
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r6cefbfb r21e442f  
    2828
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
    30     CXX="g++ -isystem /usr/include ${BUILDN32}" \
    31     LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \
    32    ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
     30CXX="g++ -isystem /usr/include ${BUILDN32}" \
     31LDFLAGS="-Wl,-rpath-link,/usr/lib32:/lib32 ${BUILDN32}" \
     32 ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    3333
    3434    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r6cefbfb r21e442f  
    2828
    2929<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
    30     CXX="g++ -isystem /usr/include ${BUILD32}" \
    31     LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \
    32     ./configure --prefix=/usr</userinput></screen>
     30CXX="g++ -isystem /usr/include ${BUILD32}" \
     31LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib ${BUILD32}" \
     32  ./configure --prefix=/usr</userinput></screen>
    3333
    3434    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.