Changeset f29824e for chapter08

Timestamp:

09/15/2022 10:30:11 PM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib, xry111/multilib

Children:

c093e6b

Parents:

a28ea0a (diff), 9644bf9 (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

Location:

chapter08

Files:

• bash.xml (modified) (1 diff)
• binutils.xml (modified) (1 diff)
• eudev.xml (modified) (1 diff)
• gawk.xml (modified) (1 diff)
• grep.xml (modified) (1 diff)

chapter08/bash.xml

@@ -88 +88 @@
 EOF</userinput></screen>
 
-    <para>Several tests invoke the obsolete <command>egrep</command>
-    command and trigger a warning.  These warnings
-    should be ignored.</para>
-
     <para>Install the package:</para>
 

chapter08/binutils.xml

@@ -193 +193 @@
 <screen><userinput remap="install">make tooldir=/usr install</userinput></screen>
 
-    <para>Remove useless static libraries:</para>
-
-<screen><userinput remap="install">rm -fv /usr/lib/lib{bfd,ctf,ctf-nobfd,opcodes}.a</userinput></screen>
+    <para>Remove useless static libraries and an empty man page:</para>
+
+<screen><userinput remap="install">rm -fv /usr/lib/lib{bfd,ctf,ctf-nobfd,opcodes}.a
+rm -fv /usr/share/man/man1/gprofng.1</userinput></screen>
 
   </sect2>

chapter08/eudev.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of Eudev</title>
-<!--
-    <para>First, fix a test script:</para>
-
-<screen><userinput remap="pre">sed -r -i 's|/usr(/bin/test)|\1|' test/udev-test.pl</userinput></screen>
--->
-<!--
-    <para>Next, remove an unneeded line that causes a build failure:</para>
-
-<screen><userinput remap="pre">sed -i '/keyboard_lookup_key/d' src/udev/udev-builtin-keyboard.c</userinput></screen>
--->
+
+    
+
+    <para>First fix the location of udev rules in the .pc file:</para>
+
+<screen><userinput remap="pre">sed -i '/udevdir/a udev_dir=${udevdir}' src/udev/udev.pc.in</userinput></screen>
 
     <para>Prepare Eudev for compilation:</para>

chapter08/gawk.xml

@@ -44 +44 @@
 
 <screen><userinput remap="pre">sed -i 's/extras//' Makefile.in</userinput></screen>
+
+    <para>Now fix a programming error identified upstream:</para>
+
+<screen><userinput remap="pre">sed -i -i '241i UPREF(m);' interpret.h</userinput></screen>
 
     <para>Prepare Gawk for compilation:</para>

chapter08/grep.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
+
+    <para>
+       First, remove a warning about using egrep and fgrep that makes
+       tests on some packages fail:
+    </para>
+
+<screen><userinput remap="pre">sed -i "s/echo/#echo/" src/egrep.sh</userinput></screen>
 
     <para>Prepare Grep for compilation:</para>