Changeset 3a9780d for BOOK/final-system


Ignore:
Timestamp:
Jul 26, 2009, 10:19:42 PM (15 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
ccf86eae
Parents:
26fee55 (diff), 444a746 (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

Location:
BOOK/final-system
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r26fee55 r3a9780d  
    5858    xpointer="xpointer(//*[@os='j'])"/>
    5959
    60     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    61     href="../common/gcc.xml"
    62     xpointer="xpointer(//*[@os='k'])"/>
     60<screen os="k"><userinput>make STAGE1_CFLAGS="-g -O2"</userinput></screen>
    6361
    6462    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/final-system/ppc/parted.xml

    r26fee55 r3a9780d  
    3030    <para os="a">Prepare Parted for compilation:</para>
    3131
    32 <screen><userinput>./configure --prefix=/usr --disable-Werror</userinput></screen>
     32<screen><userinput>./configure --prefix=/usr --disable-device-mapper</userinput></screen>
    3333
    3434    <variablelist os="b">
    … …  
    3636
    3737      <varlistentry os="b1">
    38         <term><parameter>--disable-Werror</parameter></term>
     38        <term><parameter>--disable-device-mapper</parameter></term>
    3939        <listitem>
    40           <para>The Makefile defaults to using -Werror. With <package>gcc&gcc-version;</package>
    41           that flag causes it to treat warnings (in this case, that C99 inline functions will
    42           be compiled as GNU89) as errors.  So, we disable the option.</para>
     40          <para>This disables the use of the device-mapper library, which we do
     41          not install in CLFS.</para>
    4342        </listitem>
    4443      </varlistentry>

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

    r26fee55 r3a9780d  
    5151
    5252    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    53     href="../common/gcc.xml"
     53    href="../ppc/gcc.xml"
    5454    xpointer="xpointer(//*[@os='k'])"/>
    5555

  • BOOK/final-system/ppc64/parted.xml

    r26fee55 r3a9780d  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64 --disable-Werror</userinput></screen>
     28<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64 \
     29  --disable-device-mapper</userinput></screen>
    2930
    3031    <variablelist os="b">
Note: See TracChangeset for help on using the changeset viewer.