Changeset 44e2a04

Timestamp:

10/09/2022 10:30:11 PM (19 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

1308af8

Parents:

e5de5d4 (diff), 8b539af (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:

• chapter06/bash.xml (modified) (1 diff)
• lfs-latest-git.php (modified) (1 diff)
• part3intro/toolchaintechnotes.xml (modified) (2 diffs)

chapter06/bash.xml

@@ -46 +46 @@
     <para>Prepare Bash for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                   \
-            --build=$(support/config.guess) \
-            --host=$LFS_TGT                 \
+<screen><userinput remap="configure">./configure --prefix=/usr                      \
+            --build=$(sh support/config.guess) \
+            --host=$LFS_TGT                    \
             --without-bash-malloc</userinput></screen>
 

lfs-latest-git.php

@@ -18 +18 @@
 $regex[ 'mpfr'     ] = "/^mpfr-([\d\.]+)\.tar.*$/";
 $regex[ 'Python'   ] = "/^.*Latest Python 3.*Python (3[\d\.]+\d).*$/";
-$regex[ 'systemd'  ] = "/^.*v([\d]+)$/";
+$regex[ 'systemd'  ] = "/^.*systemd v([\d]+)$/";
 //$regex[ 'sysvinit' ] = "/^.*sysvinit-([\d\.]+)dsf\.tar.*$/";
 $regex[ 'tzdata'   ] = "/^.*tzdata([\d]+[a-z]).*$/";

part3intro/toolchaintechnotes.xml

@@ -301 +301 @@
     <command>ld</command> by passing it the <parameter>--verbose</parameter>
     flag. For example, <command>$LFS_TGT-ld --verbose | grep SEARCH</command>
-    will illustrate the current search paths and their order. It shows which
-    files are linked by <command>ld</command> by compiling a dummy program and
-    passing the <parameter>--verbose</parameter> switch to the linker. For
-    example,
-    <command>$LFS_TGT-gcc dummy.c -Wl,--verbose 2&gt;&amp;1 | grep succeeded</command>
-    will show all the files successfully opened during the linking.</para>
+    will illustrate the current search paths and their order. Note that this
+    example can be run as shown only while being user
+    <systemitem class="username">lfs</systemitem>. If you come back to this
+    page later, replace <command>$LFS_TGT-ld</command> with just
+    <command>ld</command>.</para>
 
     <para>The next package installed is gcc. An example of what can be
@@ -319 +318 @@
     operation of <command>gcc</command> itself, the same search paths are not
     necessarily used. To find out which standard linker <command>gcc</command>
-    will use, run: <command>$LFS_TGT-gcc -print-prog-name=ld</command>.</para>
+    will use, run: <command>$LFS_TGT-gcc -print-prog-name=ld</command>. Again,
+    remove the <command>$LFS_TGT-</command> part if coming back to this
+    later.</para>
 
     <para>Detailed information can be obtained from <command>gcc</command> by
     passing it the <parameter>-v</parameter> command line option while compiling
-    a dummy program. For example, <command>gcc -v dummy.c</command> will show
+    a program. For example, <command>$LFS_TGT-gcc -v
+    <replaceable>example.c</replaceable></command> (or without <command>
+    $LFS_TGT-</command> if coming back later to this) will show
     detailed information about the preprocessor, compilation, and assembly
-    stages, including <command>gcc</command>'s included search paths and their
-    order.</para>
+    stages, including <command>gcc</command>'s search paths for included
+    headers and their order.</para>
 
     <para>Next installed are sanitized Linux API headers. These allow the