Changeset bf8012e

Timestamp:

02/11/2022 04:45:10 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

4513d8e

Parents:

64cae89 (diff), db3c501 (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:

Automatic merge of trunk into multilib

Files:

• appendices/dependencies.xml (modified) (1 diff)
• chapter01/changelog.xml (modified) (1 diff)
• chapter06/binutils-pass2.xml (modified) (2 diffs)
• chapter06/chapter06.xml (modified) (1 diff)
• chapter06/zlib.xml (deleted)
• chapter08/glibc.xml (modified) (4 diffs)

appendices/dependencies.xml

@@ -2460 +2460 @@
         <segtitle>&external;</segtitle>
         <seglistitem>
-          <seg>None</seg>
+          <seg>
+            <ulink url="&blfs-book;general/glib2.html">Glib2</ulink>
+          </seg>
         </seglistitem>
       </segmentedlist>

chapter01/changelog.xml

@@ -41 +41 @@
     -->
     <listitem>
+      <para>2022-02-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Workaround the issue causing binaries link to
+          libraries from the host distro for pass 2 binutils.  It's now
+          unnecessary to build zlib in chapter 6.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2022-02-09</para>
       <itemizedlist>

chapter06/binutils-pass2.xml

@@ -43 +43 @@
   <sect2 role="installation">
     <title>Installation of Binutils</title>
+
+    <!-- Don't remove this until Binutils upstream updates the libtool
+         copy.  On some host distros the issue doesn't show up.  -->
+    <para>Binutils ships an outdated libtool copy in the tarball.  It lacks
+    sysroot support so the produced binaries will be mistakenly linked to
+    libraries from the host distro.  Workaround this issue:</para>
+
+<screen><userinput remap="pre">sed '6009s/$add_dir//' -i ltmain.sh</userinput></screen>
 
     <para>Create a separate build directory again:</para>
@@ -102 +110 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>Install the package, and
-    workaround an issue causing
-    <filename class="libraryfile">libctf.so</filename>
-    to link against zlib from the host distribution:</para>
+    <para>Install the package:</para>
 
-<screen><userinput remap="install">make DESTDIR=$LFS install
-install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
   </sect2>

chapter06/chapter06.xml

@@ -29 +29 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils-pass2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc-pass2.xml"/>

chapter08/glibc.xml

@@ -637 +637 @@
 
       <seglistitem>
-        <seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
+        <seg>gencat, getconf, getent, iconv, iconvconfig, ldconfig,
         ldd, lddlibc4, locale, localedef, makedb, mtrace, nscd,
         pcprofiledump, pldd, sln, sotruss, sprof, tzselect, xtrace,
         zdump, and zic</seg>
         <seg>ld-linux-x86-64.so.2, ld-linux.so.2,
-        libBrokenLocale.{a,so}, libSegFault.so, libanl.{a,so},
+        libBrokenLocale.{a,so}, libanl.{a,so},
         libc.{a,so}, libc_nonshared.a,
         libcrypt.{a,so}, libdl.{a,so.2}, libg.a, libm.{a,so},
@@ -667 +667 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="catchsegv">
-        <term><command>catchsegv</command></term>
-        <listitem>
-          <para>Can be used to create a stack trace when a program
-          terminates with a segmentation fault</para>
-          <indexterm zone="ch-system-glibc catchsegv">
-            <primary sortas="b-catchsegv">catchsegv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gencat">
         <term><command>gencat</command></term>
@@ -754 +743 @@
         <term><command>lddlibc4</command></term>
         <listitem>
-          <para>Assists <command>ldd</command> with object files</para>
+          <para>Assists <command>ldd</command> with object files.
+          It does not exist on newer architectures like x86_64</para>
           <indexterm zone="ch-system-glibc lddlibc4">
             <primary sortas="b-lddlibc4">lddlibc4</primary>
@@ -928 +918 @@
       </varlistentry>
 
-      <varlistentry id="libSegFault">
-        <term><filename class="libraryfile">libSegFault</filename></term>
-        <listitem>
-          <para>The segmentation fault signal handler, used by
-          <command>catchsegv</command></para>
-          <indexterm zone="ch-system-glibc libSegFault">
-            <primary sortas="c-libSegFault">libSegFault</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libanl">
         <term><filename class="libraryfile">libanl</filename></term>