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/common
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r6cefbfb r21e442f  
    4949
    5050<screen os="ca"><userinput>CC="gcc -isystem /usr/include" \
    51     LDFLAGS="-Wl,-rpath-link,/lib" \
    52     ../binutils-&binutils-version;/configure --prefix=/usr \
     51LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
     52  ../binutils-&binutils-version;/configure --prefix=/usr \
    5353    --enable-shared</userinput></screen>
    5454

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

    r6cefbfb r21e442f  
    3030    <para os="a">Prepare CLooG-PPL for compilation:</para>
    3131
    32 <screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
    33     ./configure --prefix=/usr --enable-shared --with-gmp \
     32<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
     33LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
     34  ./configure --prefix=/usr --enable-shared --with-gmp \
    3435    --with-ppl</userinput></screen>
    3536

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

    r6cefbfb r21e442f  
    3939    </note>
    4040
    41     <para os="l3">The following sed makes sure that newly built EGLIBC is tested,
    42     during make install, instead of the one we previously build:</para>
    43 
    44 <screen os="l4"><userinput>LINKER=$(readelf -l $(file /tools/lib/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
     41    <para os="l1">At the end of the installation, the build system will run
     42    a sanity test to make sure everything installed properly. This script will
     43    attempt to test for a library that is only used in the test suite and is
     44    never installed. Prevent the script from testing for this library with the
     45    following command:</para>
     46
     47<screen os="l2"><userinput>sed -i 's/\(&amp;&amp; $name ne\) "db1"/ &amp; \1 "nss_test1"/' scripts/test-installation.pl</userinput></screen>
     48
     49    <para os="l3">This same script performs its tests by attempting to compile
     50    test programs against certain libraries. However it does not specify the
     51    ld.so, and our toolchain is still configured to use the one in /tools. The
     52    following set of commands will force the script to use the complete path
     53    of the new ld.so that was just installed:</para>
     54
     55<screen os="l4"><userinput>LINKER=$(readelf -l /tools/bin/bash | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
    4556sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
    4657  scripts/test-installation.pl
    4758unset LINKER</userinput></screen>
     59
     60    <para os="p1">The following patch fixes an issue where EGLIBC will
     61    improperly handle a condition where an elf binary has missing
     62    dependencies:</para>
     63
     64<screen os="p2"><userinput>patch -Np1 -i ../&eglibc-dl_dep_fix-patch;</userinput></screen>
    4865
    4966    <para os="b">The EGLIBC build system is self-contained and will install
    … …  
    95112
    96113<screen os="n"><userinput>cp -v ../eglibc-&eglibc-version;/iconvdata/gconv-modules iconvdata
    97 make -k check &gt;eglibc-check-log 2&gt;&amp;1 ; grep Error eglibc-check-log</userinput></screen>
     114make -k check 2&gt;&amp;1 | tee eglibc-check-log; grep Error eglibc-check-log</userinput></screen>
    98115
    99116    <para os="o">The EGLIBC test suite is highly dependent on certain functions of

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

    r6cefbfb r21e442f  
    4141    <para os="h">Prepare GCC for compilation:</para>
    4242
    43 <screen os="i"><userinput>CC="gcc -Wl,-rpath-link,/lib -isystem /usr/include" \
    44     CXX="g++ -Wl,-rpath-link,/lib -isystem /usr/include" \
    45     ../gcc-&gcc-version;/configure --prefix=/usr \
     43<screen os="i"><userinput>CC="gcc -isystem /usr/include" \
     44CXX="g++ -isystem /usr/include" \
     45LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
     46  ../gcc-&gcc-version;/configure --prefix=/usr \
    4647    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
    4748    --enable-__cxa_atexit --enable-c99 --enable-long-long \

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

    r6cefbfb r21e442f  
    4949
    5050<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
    51     CXX="g++ -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
    52     ./configure --prefix=/usr --enable-cxx --enable-mpbsd</userinput></screen>
     51CXX="g++ -isystem /usr/include" \
     52LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
     53  ./configure --prefix=/usr --enable-cxx --enable-mpbsd</userinput></screen>
    5354
    5455    <para os="c">Compile the package:</para>

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

    r6cefbfb r21e442f  
    2929
    3030<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
    31 LDFLAGS="-Wl,-rpath-link,/lib" EGREP="grep -E" \
    32 ./configure --prefix=/usr</userinput></screen>
     31LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
     32  EGREP="grep -E" ./configure --prefix=/usr</userinput></screen>
    3333
    3434    <para os="c">Compile the package:</para>

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

    r6cefbfb r21e442f  
    2828    <para os="a">Prepare MPFR for compilation:</para>
    2929
    30 <screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
    31     ./configure --prefix=/usr --enable-shared \
    32         --with-gmp=/usr</userinput></screen>
     30<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
     31LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
     32  ./configure --prefix=/usr --enable-shared \
     33    --with-gmp=/usr</userinput></screen>
    3334
    3435    <para os="c">Compile the package:</para>

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

    r6cefbfb r21e442f  
    3030
    3131<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
    32     CXX="g++ -isystem /usr/include" \
    33     LDFLAGS="-Wl,-rpath-link,/lib" \
    34     ./configure --prefix=/usr --enable-shared \
    35       --disable-optimization</userinput></screen>
     32CXX="g++ -isystem /usr/include" \
     33LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
     34  ./configure --prefix=/usr --enable-shared \
     35    --disable-optimization</userinput></screen>
    3636
    3737    <para os="c">Compile the package:</para>

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

    r6cefbfb r21e442f  
    2828    <para os="a">Prepare Zlib for compilation:</para>
    2929
    30 <screen os="b"><userinput>CC="gcc -isystem /usr/include" CXX="g++ -isystem /usr/include" \
    31     LDFLAGS="-Wl,-rpath-link,/lib" ./configure --prefix=/usr</userinput></screen>
     30<screen os="b"><userinput>CC="gcc -isystem /usr/include" \
     31CXX="g++ -isystem /usr/include" \
     32LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
     33  ./configure --prefix=/usr</userinput></screen>
    3234
    3335    <para os="c">Compile the package:</para>
Note: See TracChangeset for help on using the changeset viewer.