Changeset 5375902a


Ignore:
Timestamp:
May 17, 2014, 11:54:28 AM (9 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
35d0341
Parents:
2264482 (diff), d3b105f (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 'sysvinit' of git.cross-lfs.org:cross-lfs into sysvinit

Location:
BOOK
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • BOOK/cross-tools/common/binutils-32.xml

    r2264482 r5375902a  
    5252    --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
    5353    --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \
    54     --disable-static --disable-multilib</userinput></screen>
     54    --disable-static --disable-multilib --disable-werror</userinput></screen>
    5555
    5656    <variablelist os="bd">
     
    117117      </varlistentry>
    118118
     119      <varlistentry os="bd8">
     120        <term><parameter>--disable-werror</parameter></term>
     121        <listitem>
     122          <para>This prevents the build from stopping in the event that there
     123          are warnings from theo host's compiler.</para>
     124        </listitem>
     125      </varlistentry>
     126
    119127    </variablelist>
    120128
  • BOOK/cross-tools/common/binutils.xml

    r2264482 r5375902a  
    5252    --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
    5353    --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls \
    54     --disable-static --enable-64-bit-bfd --disable-multilib</userinput></screen>
     54    --disable-static --enable-64-bit-bfd --disable-multilib --disable-werror</userinput></screen>
    5555
    5656    <variablelist os="bd">
     
    124124      </varlistentry>
    125125
     126      <varlistentry os="bd9">
     127        <term><parameter>--disble-werror</parameter></term>
     128        <listitem>
     129          <para>This prevents the build from stopping in the event that there
     130          are warnings from the host's compiler.</para>
     131        </listitem>
     132      </varlistentry>
    126133    </variablelist>
    127134
  • BOOK/cross-tools/multilib/binutils.xml

    r2264482 r5375902a  
    5151    --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
    5252    --with-sysroot=${CLFS} --with-lib-path=/tools/lib:/tools/lib64 \
    53     --disable-nls --disable-static --enable-64-bit-bfd</userinput></screen>
     53    --disable-nls --disable-static --enable-64-bit-bfd --disable-werror</userinput></screen>
    5454
    5555    <variablelist os="bd">
     
    8282      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8383      href="../common/binutils.xml"
    84       xpointer="xpointer(//*[@os='bd8'])"/>
     84      xpointer="xpointer(//*[@os='bd9'])"/>
    8585
    8686    </variablelist>
  • BOOK/final-system/common/util-linux.xml

    r2264482 r5375902a  
    7878
    7979<screen os="h"><userinput>make install</userinput></screen>
     80
     81    <para os="i">Move the <command>logger</command> binary to
     82    <filename class="directory">/bin</filename> as it is needed by the
     83    CLFS Bootscripts package:</para>
     84
     85<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
    8086
    8187  </sect2>
  • BOOK/final-system/multilib/util-linux-64bit.xml

    r2264482 r5375902a  
    6565    xpointer="xpointer(//*[@os='h'])"/>
    6666
     67    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     68    href="../common/util-linux.xml"
     69    xpointer="xpointer(//*[@os='i'])"/>
     70
     71    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     72    href="../common/util-linux.xml"
     73    xpointer="xpointer(//*[@os='j'])"/>
     74
    6775  </sect2>
    6876
  • BOOK/introduction/common/changelog.xml

    r2264482 r5375902a  
    4141      <itemizedlist>
    4242        <listitem>
     43          <para>[William Harrington] - Add --disable-werror to cross-tools
     44          Bintuils instructions.</para>
     45        </listitem>
     46        <listitem>
     47          <para>[William Harrington] - Move <command>logger</command> to
     48          <filename class="directory">/bin</filename> for CLFS-Bootscripts
     49          requirement.</para>
     50        </listitem>
     51        <listitem>
    4352          <para>[Chris] - Changed "systemd" reference on Kbd page to
    4453          CLFS Bootscripts, and added dumpkeys and kbd_mode to list of
Note: See TracChangeset for help on using the changeset viewer.