Changeset 3d66e17 for BOOK/final-system/common

Timestamp:

Jan 7, 2014, 5:10:08 PM (11 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

b1448646

Parents:

07afa1a

Message:

Use libiberty from GCC instead of Binutils

Location:

BOOK/final-system/common

Files:

• binutils.xml (modified) (3 diffs)
• gcc.xml (modified) (5 diffs)

BOOK/final-system/common/binutils.xml

@@ -104 +104 @@
 <screen os="s"><userinput>make tooldir=/usr install</userinput></screen>
 
-    <para os="t">Install the <filename class="headerfile">libiberty</filename> header
-    file that is needed by some packages:</para>
-
-<screen os="u"><userinput>cp -v ../binutils-&binutils-dir;/include/libiberty.h /usr/include</userinput></screen>
-
   </sect2>
 
@@ -123 +118 @@
         objdump,
         ranlib, readelf, size, strings, and strip</seg>
-        <seg>libiberty.a, libbfd.[a,so], and libopcodes.[a,so]</seg>
+        <seg>libbfd.[a,so], and libopcodes.[a,so]</seg>
         <seg>/usr/lib/ldscripts</seg>
       </seglistitem>
@@ -310 +305 @@
       </varlistentry>
 
-      <varlistentry id="libiberty">
-        <term><filename class="libraryfile">libiberty</filename></term>
-        <listitem>
-          <para>Contains routines used by various GNU programs, including
-          <command>getopt</command>, <command>obstack</command>,
-          <command>strerror</command>, <command>strtol</command>, and
-          <command>strtoul</command></para>
-          <indexterm zone="ch-system-binutils libiberty">
-            <primary sortas="c-libiberty">libiberty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libbfd">
         <term><filename class="libraryfile">libbfd</filename></term>

BOOK/final-system/common/gcc.xml

@@ -36 +36 @@
 <screen os="fix2"><userinput>cp -v gcc/Makefile.in{,.orig}
 sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
-
-    <para os="d">Apply a <command>sed</command> substitution that will suppress the
-    installation of <filename class="libraryfile">libiberty.a</filename>. The
-    version of <filename class="libraryfile">libiberty.a</filename> provided by
-    Binutils will be used instead:</para>
-
-<screen os="e"><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
 
     <para os="f">The GCC documentation recommends building GCC outside of the source
@@ -61 +54 @@
     --disable-multilib --disable-libstdcxx-pch \
     --enable-cloog-backend=isl --disable-isl-version-check --with-system-zlib \
-    --enable-checking=release --enable-libstdcxx-time \
-    --disable-install-libiberty</userinput></screen>
+    --enable-checking=release --enable-libstdcxx-time</userinput></screen>
 
     <para os="j">Compile the package:</para>
@@ -99 +91 @@
 <screen os="t"><userinput>make install</userinput></screen>
 
-    <para os="u">Some packages expect the C preprocessor to be installed in the
+    <para os="u">Install the <filename class="headerfile">libiberty</filename> header
+    file that is needed by some packages:</para>
+
+<screen os="v"><userinput>cp -v ../gcc-&gcc-version;/include/libiberty.h /usr/include</userinput></screen>
+
+    <para os="w">Some packages expect the C preprocessor to be installed in the
     <filename class="directory">/lib</filename> directory.
     To support those packages, create this symlink:</para>
 
-<screen os="v"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
-
-    <para os="w">Many packages use the name <command>cc</command> to call the C
+<screen os="x"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
+
+    <para os="y">Many packages use the name <command>cc</command> to call the C
     compiler. To satisfy those packages, create a symlink:</para>
 
-<screen os="x"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
-
-    <para os="y">Finally, move a misplaced file:</para>
-
-<screen os="z"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
+<screen os="z"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
+
+    <para os="aa">Finally, move a misplaced file:</para>
+
+<screen os="ab"><userinput>mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
 
   </sect2>
@@ -127 +124 @@
         <seg>c++, cc (link to gcc), cpp, g++, gcc, and gcov</seg>
         <seg>libasan.[a,so], libgcc.a, libgcc_eh.a, libgcc_s.so, libgcov.a,
-        libgomp.[a,so], libmudflap.[a,so], libmudflapth.[a,so], libssp.[a,so],
-        libssp_nonshared.a, libstdc++.[a,so], libsupc++.a, and libtsan.[a,so]</seg>
+        libgomp.[a,so], libiberty.a, libmudflap.[a,so], libmudflapth.[a,so],
+        libssp.[a,so], libssp_nonshared.a, libstdc++.[a,so], libsupc++.a, and
+        libtsan.[a,so]</seg>
         <seg>/usr/include/c++, /usr/lib/gcc, /usr/share/gcc-&gcc-version;</seg>
       </seglistitem>
@@ -242 +240 @@
       </varlistentry>
 
+      <varlistentry id="libiberty">
+        <term><filename class="libraryfile">libiberty</filename></term>
+        <listitem>
+          <para>Contains routines used by various GNU programs, including
+          <command>getopt</command>, <command>obstack</command>,
+          <command>strerror</command>, <command>strtol</command>, and
+          <command>strtoul</command></para>
+          <indexterm zone="ch-system-gcc libiberty">
+            <primary sortas="c-libiberty">libiberty</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libmudflap">
         <term><filename class="libraryfile">libmudflap</filename></term>