Changeset efcb393 for chapter06/glibc.xml

Timestamp:

05/03/2020 09:02:51 PM (4 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.0-rc1, 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, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

a715dec

Parents:

9d719e2

Message:

Make the new book

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11831 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

File:

• chapter06/glibc.xml (modified) (5 diffs)

chapter06/glibc.xml

@@ -44 +44 @@
     <title>Installation of Glibc</title>
 
-    <note><para>The Glibc build system is self-contained and will install
-    perfectly, even though the compiler specs file and linker are still
-    pointing to <filename class="directory">/tools</filename>. The specs
-    and linker cannot be adjusted before the Glibc install because the
-    Glibc autoconf tests would give false results and defeat the goal
-    of achieving a clean build.</para></note>
-
     <para>Some of the Glibc programs use the non-FHS compliant
     <filename class="directory">/var/db</filename> directory to store
@@ -67 +60 @@
 <screen><userinput remap="pre">sed -i '/asm.socket.h/a# include &lt;linux/sockios.h&gt;' \
    sysdeps/unix/sysv/linux/bits/socket.h</userinput></screen>
--->
+=== already done ===
     <para>Create a symlink for LSB
     compliance. Additionally, for x86_64, create a compatibility symlink
@@ -79 +72 @@
     ;;
 esac</userinput></screen>
-<!--
+
     <para>Remove a file that may be left over from a previous build attempt:
     </para>
@@ -93 +86 @@
     <para>Prepare Glibc for compilation:</para>
 
-<screen><userinput remap="configure">CC="gcc -ffile-prefix-map=/tools=/usr" \
-../configure --prefix=/usr                          \
-             --disable-werror                       \
-             --enable-kernel=&min-kernel;                    \
-             --enable-stack-protector=strong        \
-             --with-headers=/usr/include            \
+<screen><userinput remap="configure">../configure --prefix=/usr                            \
+             --disable-werror                         \
+             --enable-kernel=&min-kernel;                      \
+             --enable-stack-protector=strong          \
+             --with-headers=/usr/include              \
              libc_cv_slibdir=/lib</userinput></screen>
-
-   <variablelist>
+  <!-- WIP -->
+    <variablelist>
       <title>The meaning of the options and new configure parameters:</title>
 
       <varlistentry>
-        <term><parameter>CC="gcc -ffile-prefix-map=/tools=/usr"</parameter></term>
-        <listitem>
-          <para>Make GCC record any references to files in /tools in result
-          of the compilation as if the files resided in /usr.  This avoids
-          introduction of invalid paths in debugging symbols.</para>
+        <term><parameter>CC="gcc -ffile-prefix-map=$LFS_DIR=$DIR"</parameter></term>
+        <listitem>
+          <para>Make GCC record any references to files in <filename
+          class="directory">/usr/lib/gcc/x86_64-lfs-linux-gnu</filename>
+          in result of the compilation as if the files resided in <filename
+          class="directory">/usr/lib/gcc/x86_64-pc-linux-gnu</filename>.
+          This avoids introduction of invalid paths in debugging
+          symbols.</para>
         </listitem>
       </varlistentry>
@@ -129 +124 @@
         </listitem>
       </varlistentry>
-
+<!-- do we need this one? -->
       <varlistentry>
         <term><parameter>--with-headers=/usr/include</parameter></term>
         <listitem>
           <para>This option tells the build system where to find the
-          kernel API headers. By default, those headers are sought in
-          <filename class="directory">/tools/include</filename>.</para>
+          kernel API headers.</para>
         </listitem>
       </varlistentry>