소스 검색

Moved placement of m4 in chapters 5 and 6 so that
* the chapter 5 m4 links against the glibc in /tools
* the chapter 6 m4 is built before anything that hard codes the location of m4
Added a host prerequisite for m4


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

Jeremy Huntwork 17 년 전
부모
커밋
787fe0c794
5개의 변경된 파일21개의 추가작업 그리고 4개의 파일을 삭제
  1. 12 0
      chapter01/changelog.xml
  2. 1 1
      chapter05/chapter05.xml
  3. 1 1
      chapter06/chapter06.xml
  4. 2 2
      general.ent
  5. 5 0
      prologue/hostreqs.xml

+ 12 - 0
chapter01/changelog.xml

@@ -37,6 +37,18 @@
 
 -->
 
+    <listitem>
+      <para>2008-10-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Fixed build locations of m4 so that it links against the
+          glibc built in /tools and so that no packages in chapter 6 hard-code references
+          to the temporarly location. Also made m4 a host prerequisite.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+
     <listitem>
       <para>2008-10-15</para>
       <itemizedlist>

+ 1 - 1
chapter05/chapter05.xml

@@ -14,7 +14,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="toolchaintechnotes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="binutils-pass1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc-pass1.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="glibc.xml"/>
@@ -37,6 +36,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gzip.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/>

+ 1 - 1
chapter06/chapter06.xml

@@ -30,6 +30,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="iana-etc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bison.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procps.xml"/>
@@ -55,7 +56,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="kbd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="man-db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="module-init-tools.xml"/>

+ 2 - 2
general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20081015">
-<!ENTITY releasedate "October 15, 2008">
+<!ENTITY version "SVN-20081018">
+<!ENTITY releasedate "October 18, 2008">
 <!ENTITY copyrightdate "1999&ndash;2008">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 5 - 0
prologue/hostreqs.xml

@@ -101,6 +101,10 @@
       located in <xref linkend="chapter-bootable"/>.</para>
     </listitem>
 
+    <listitem>
+      <para><emphasis role="strong">M4-1.4</emphasis></para>
+    </listitem>
+
     <listitem>
       <para><emphasis role="strong">Make-3.79.1</emphasis></para>
     </listitem>
@@ -162,6 +166,7 @@ gcc --version | head -n1
 grep --version | head -n1
 gzip --version | head -n1
 cat /proc/version
+m4 --version | head -n1
 make --version | head -n1
 patch --version | head -n1
 echo Perl `perl -V:version`