Changeset 34ed6ec

Timestamp:

Feb 21, 2006, 2:10:53 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

1326641

Parents:

849e2de

Message:

r1067@server (orig r1065): ken | 2006-01-13 04:33:33 -0800
Move grep ahead of libtool to avoid hardcoding EGREP as /tools/bin in libtool, per LFS

Location:

BOOK

Files:

• final-system/alpha-chapter.xml (modified) (2 diffs)
• final-system/mips-chapter.xml (modified) (2 diffs)
• final-system/mips64-64-chapter.xml (modified) (2 diffs)
• final-system/mips64-chapter.xml (modified) (2 diffs)
• final-system/ppc-chapter.xml (modified) (2 diffs)
• final-system/sparc-chapter.xml (modified) (2 diffs)
• final-system/sparc64-64-chapter.xml (modified) (2 diffs)
• final-system/sparc64-chapter.xml (modified) (2 diffs)
• final-system/sparcv8-chapter.xml (modified) (2 diffs)
• final-system/x86-chapter.xml (modified) (2 diffs)
• final-system/x86_64-64-chapter.xml (modified) (2 diffs)
• final-system/x86_64-chapter.xml (modified) (2 diffs)
• introduction/common/changelog.xml (modified) (1 diff)

BOOK/final-system/alpha-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>

BOOK/final-system/mips-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>

BOOK/final-system/mips64-64-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>

BOOK/final-system/mips64-chapter.xml

@@ -60 +60 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/file-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-n32.xml"/>
@@ -71 +72 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>

BOOK/final-system/ppc-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>

BOOK/final-system/sparc-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>

BOOK/final-system/sparc64-64-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>

BOOK/final-system/sparc64-chapter.xml

@@ -52 +52 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
@@ -60 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>

BOOK/final-system/sparcv8-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>

BOOK/final-system/x86-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>

BOOK/final-system/x86_64-64-chapter.xml

@@ -44 +44 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
@@ -49 +50 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>

BOOK/final-system/x86_64-chapter.xml

@@ -52 +52 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
@@ -60 +61 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>

BOOK/introduction/common/changelog.xml

@@ -38 +38 @@
 
     <listitem>
+      <para>January 13, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Moved grep ahead of libtool to avoid /tools being hardcoded
+          into the libtool script for EGREP.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+        
+    <listitem>
       <para>January 12, 2006</para>
       <itemizedlist>