Changeset 7003296 in clfs-embedded


Ignore:
Timestamp:
Feb 11, 2011, 5:10:30 AM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
master
Children:
7afc252
Parents:
e67fb9b (diff), 1fd00ea (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 remote branch 'remotes/abradford/master'

Location:
BOOK
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • BOOK/beyond-clfs/common/hostapd.xml

    re67fb9b r7003296  
    5353    <para os="c">Compile the package:</para>
    5454
    55 <screen os="d"><userinput>make CC=${CC} CFLAGS="-g -Os -Wall"</userinput></screen>
     55<screen os="d"><userinput>make CFLAGS="-g -Os -Wall"</userinput></screen>
    5656
    5757    <para os="e">Install the package:</para>

  • BOOK/bootloaders/mips/colo.xml

    re67fb9b r7003296  
    3838    <para os="a">Compile the Colo package:</para>
    3939
    40 <screen os="b"><userinput>make CC="${CC}" CROSS_COMPILE="${CLFS_TARGET}-" binary
    41 make CC="${CC}" CROSS_COMPILE="${CLFS_TARGET}-" tooldirs</userinput></screen>
     40<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" binary
     41make CROSS_COMPILE="${CLFS_TARGET}-" tooldirs</userinput></screen>
    4242
    4343    <para os="c">Install the package:</para>

  • BOOK/cross-tools/x86/gcc-final.xml

    re67fb9b r7003296  
    4141  --enable-languages=c --enable-c99 --enable-long-long \
    4242  --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
    43   --with-mpc=${CLFS}/cross-tools --with-arch=${CLFS_CPU}</userinput></screen>
     43  --with-mpc=${CLFS}/cross-tools --with-arch=${CLFS_CPU} \
     44  --disable-multilib</userinput></screen>
    4445
    4546    <variablelist os="af">

  • BOOK/cross-tools/x86/gcc-static.xml

    re67fb9b r7003296  
    4848  --disable-decimal-float --disable-libgomp --disable-libmudflap \
    4949  --disable-libssp --disable-threads --enable-languages=c \
    50   --with-arch=${CLFS_CPU}</userinput></screen>
     50  --with-arch=${CLFS_CPU} --disable-multilib</userinput></screen>
    5151
    5252    <variablelist os="af">
    … …  
    219219      </varlistentry>
    220220
     221      <varlistentry os="af20">
     222        <term><parameter>--disable-multilib</parameter></term>
     223        <listitem>
     224          <para>This option specifies that multiple target libraries should
     225          not be built.</para>
     226        </listitem>
     227      </varlistentry>
     228
    221229    </variablelist>
    222230

  • BOOK/cross-tools/x86/variables.xml

    re67fb9b r7003296  
    3737echo export CLFS_ARCH=\""${CLFS_ARCH}\"" &gt;&gt; ~/.bashrc
    3838echo export CLFS_ENDIAN=\""${CLFS_ENDIAN}\"" &gt;&gt; ~/.bashrc
    39 echo export CLFS_ENDIAN=\""${CLFS_CPU}\"" &gt;&gt; ~/.bashrc</userinput></screen>
     39echo export CLFS_CPU=\""${CLFS_CPU}\"" &gt;&gt; ~/.bashrc</userinput></screen>
    4040
    4141  <table os="i">

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

    re67fb9b r7003296  
    3333    <para os="c">Prepare Zlib for compilation:</para>
    3434
    35 <screen os="d"><userinput>CC="${CC}" ./configure --prefix=/usr --shared</userinput></screen>
     35<screen os="d"><userinput>./configure --prefix=/usr --shared</userinput></screen>
    3636
    3737    <variablelist os="aa">
Note: See TracChangeset for help on using the changeset viewer.