Changeset df2e99e

Timestamp:

02/02/2021 09:35:59 PM (2 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/git-transition, xry111/glibc-2.34, xry111/glibc-2.37, xry111/kcfg-revise, xry111/lfs-next, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008, xry111/tester-nohack, xry111/usr-move

Children:

c0d2bd0

Parents:

428695c

Message:

Really apply various fixes for building with glibc-2.33,
and change the order in chapter 8 so that everything is built against
chapter 8 glibc.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12112 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter06/binutils-pass2.xml (modified) (1 diff)
• chapter06/file.xml (modified) (2 diffs)
• chapter08/chapter08.xml (modified) (2 diffs)
• chapter08/glibc.xml (modified) (2 diffs)
• chapter08/tcl.xml (modified) (1 diff)

chapter01/changelog.xml

@@ -47 +47 @@
       <para>2021-02-02</para>
         <listitem>
+          <para>[pierre] - Move tcl, expect, and dejagnu just before binutils
+          in chapter 8: this allows to build them against chapter 8
+          glibc.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Tweaks to allow building with glibc-2.33:
+          build a "file" executable for the host before cross-compiling
+          it; replace the relinked libctf with the one that was linked
+          during "make" in binutils-pass2.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to bc-3.2.6. Fixes
           <ulink url="&lfs-ticket-root;4800">#4800</ulink>.</para>

chapter06/binutils-pass2.xml

@@ -88 +88 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
+<screen><userinput remap="install">make DESTDIR=$LFS install
+install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib</userinput></screen>
 
     <para>

chapter06/file.xml

@@ -44 +44 @@
     <title>Installation of File</title>
 
+    <para>The build host <quote>file</quote> command iwith the same version as
+    the one we are building is needed for building the signature file. Run the
+    following commands to build it:</para>
+
+<screen><userinput remap="pre">mkdir build
+pushd build
+../configure
+make
+popd</userinput></screen>
+
     <para>Prepare File for compilation:</para>
 
@@ -55 +65 @@
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make FILE_COMPILE=$(pwd)/build/src/file</userinput></screen>
 
     <para>Install the package:</para>

chapter08/chapter08.xml

@@ -15 +15 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgmgt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-pages.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
-
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibc.xml"/>
@@ -31 +26 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="flex.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>

chapter08/glibc.xml

@@ -127 +127 @@
 
 <!-- Use remap="make" here to work around a jhalfs issue. -->
-<screen><userinput remap="make">case $(uname -m) in
+<!--<screen><userinput remap="make">case $(uname -m) in
   i?86)   ln -sfnv $PWD/elf/ld-linux.so.2        /lib ;;
   x86_64) ln -sfnv $PWD/elf/ld-linux-x86-64.so.2 /lib ;;
@@ -135 +135 @@
     stage of building in the chroot environment.  It will be overwritten
     in the install phase below.</para></note>
-
+-->
 <screen><userinput remap="test">make check</userinput></screen>
 

chapter08/tcl.xml

@@ -46 +46 @@
 
     <para>This package and the next two (Expect and DejaGNU) are
-    installed to support running the test suites for GCC and binutils and other
+    installed to support running the test suites for binutils and GCC and other
     packages.  Installing three packages for testing purposes may seem
     excessive, but it is very reassuring, if not essential, to know that the
-    most important tools are working properly. These packages are required
-    to run the test suites in this chapter.</para>
+    most important tools are working properly.</para>
 
 <!--    <para>Note that the Tcl package used here is a minimal version needed