Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/binutils.xml

    rec008670 r229ed25  
    4040    needs to be resolved before running the test suites for Binutils and GCC.</para>
    4141
     42<!-- Branch update patch area
     43    <para os="p1">The following patch contains a number of updates to the
     44    &binutils-version; branch by the Binutils developers:</para>
     45
     46    <screen os="p2"><userinput>patch -Np1 -i ../&binutils-branch_update-patch;</userinput></screen>
     47-->
     48
    4249    <para os="g">The Binutils documentation recommends building Binutils outside of the
    4350    source directory in a dedicated build directory:</para>
     
    5057<screen os="ca"><userinput>CC="gcc -isystem /usr/include" \
    5158LDFLAGS="-Wl,-rpath-link,/usr/lib:/lib" \
    52   ../binutils-&binutils-version;/configure --prefix=/usr \
     59  ../binutils-&binutils-dir;/configure --prefix=/usr \
    5360    --enable-shared</userinput></screen>
    5461
     
    9198    <para os="p">Test the results:</para>
    9299
    93 <screen os="q"><userinput>make check</userinput></screen>
     100<screen os="q"><userinput remap="test">make check</userinput></screen>
    94101
    95102    <para os="r">Install the package:</para>
     
    100107    file that is needed by some packages:</para>
    101108
    102 <screen os="u"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen>
     109<screen os="u"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /usr/include</userinput></screen>
    103110
    104111  </sect2>
     
    113120
    114121      <seglistitem>
    115         <seg>addr2line, ar, as, c++filt, gprof, ld, nm, objcopy, objdump,
     122        <seg>addr2line, ar, as, c++filt, elfedit, gprof, ld, ld.bfd, nm, objcopy,
     123        objdump,
    116124        ranlib, readelf, size, strings, and strip</seg>
    117125        <seg>libiberty.a, libbfd.[a,so], and libopcodes.[a,so]</seg>
     
    170178      </varlistentry>
    171179
     180      <varlistentry id="elfedit">
     181        <term><command>elfedit</command></term>
     182        <listitem>
     183          <para>Updates the ELF header of ELF files</para>
     184          <indexterm zone="ch-system-binutils elfedit">
     185            <primary sortas="b-elfedit">elfedit</primary>
     186          </indexterm>
     187        </listitem>
     188      </varlistentry>
     189
    172190      <varlistentry id="gprof">
    173191        <term><command>gprof</command></term>
     
    188206          <indexterm zone="ch-system-binutils ld">
    189207            <primary sortas="b-ld">ld</primary>
     208          </indexterm>
     209        </listitem>
     210      </varlistentry>
     211
     212      <varlistentry id="ld.bfd">
     213        <term><command>ld.bfd</command></term>
     214        <listitem>
     215          <para>Hard link to <command>ld</command></para>
     216          <indexterm zone="ch-system-binutils ld.bfd">
     217            <primary sortas="b-ld.bfd">ld.bfd</primary>
    190218          </indexterm>
    191219        </listitem>
Note: See TracChangeset for help on using the changeset viewer.