r1980 - in profiles/LFS/branches/gcc4: chapter05 chapter06 config

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Tue Aug 30 18:36:05 PDT 2005


Author: thomasp
Date: 2005-08-30 19:36:04 -0600 (Tue, 30 Aug 2005)
New Revision: 1980

Modified:
   profiles/LFS/branches/gcc4/chapter05/adjustingtoolchain.xml
   profiles/LFS/branches/gcc4/chapter05/gcc-pass2.xml
   profiles/LFS/branches/gcc4/chapter05/glibc.xml
   profiles/LFS/branches/gcc4/chapter06/coreutils.xml
   profiles/LFS/branches/gcc4/chapter06/glibc.xml
   profiles/LFS/branches/gcc4/chapter06/readjustingtoolchain.xml
   profiles/LFS/branches/gcc4/config/general.ent
   profiles/LFS/branches/gcc4/config/package.ent
Log:
apply patches from DJ Lucas

Modified: profiles/LFS/branches/gcc4/chapter05/adjustingtoolchain.xml
===================================================================
--- profiles/LFS/branches/gcc4/chapter05/adjustingtoolchain.xml	2005-08-26 19:40:29 UTC (rev 1979)
+++ profiles/LFS/branches/gcc4/chapter05/adjustingtoolchain.xml	2005-08-31 01:36:04 UTC (rev 1980)
@@ -20,33 +20,25 @@
     </stage>
     <remove>&build_dir;/&binutils-directory;</remove>
     <remove>&build_dir;/binutils-build</remove>
-<!--    <search_replace>
-      <file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
-      <find>/lib/&glibc-loader;</find>
-      <replace>/tools/lib/&glibc-loader;</replace>
-    </search_replace> -->
-<!-- New specfile dump and change -->
-      <execute command="gcc"> 
-        <param>-dumpspecs > </param>
-        <param>`gcc -print-search-dirs | head -n 1 | awk '{ print $2 "specs" }'`</param>
+
+    <execute command="gcc"> 
+      <param>-dumpspecs > </param>
+      <param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
       </execute>
       <execute command="sed">
         <param>-i -e 's@^/lib/ld-linux.so.2@/tools&@g'</param>
-        <param>`gcc -print-search-dirs | head -n 1 | awk '{ print $2 "specs" }'`</param>
+        <param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
       </execute>
-
-<!-- Old command
-<remove>/tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h}</remove>
-New Commands -->
       <execute command="find">
         <param>$(gcc -print-search-dirs | head -n 1 | awk '{ print $2 "include" }')/*</param> 
         <param>-xtype d -exec rm -rf \{} \;</param>
+        <param>|| true</param>
       </execute>
 
       <execute command="rm">
         <param>-f</param> 
-        <param>$(grep -l 'DO NOT EDIT THIS FILE'</param>
-        <param>`gcc -print-search-dirs | head -n 1 | awk '{ print $2 "include" }'`/*)</param>
+        <param>`grep -l 'DO NOT EDIT THIS FILE'</param>
+        <param>$(dirname $(gcc -print-libgcc-file-name)/include)/*`</param>
       </execute>
 
     <!-- Test basic functions of toolchain with:

Modified: profiles/LFS/branches/gcc4/chapter05/gcc-pass2.xml
===================================================================
--- profiles/LFS/branches/gcc4/chapter05/gcc-pass2.xml	2005-08-26 19:40:29 UTC (rev 1979)
+++ profiles/LFS/branches/gcc4/chapter05/gcc-pass2.xml	2005-08-31 01:36:04 UTC (rev 1980)
@@ -26,7 +26,7 @@
           <variable name="CFLAGS" />
           <variable name="CXXFLAGS" />
         </environment>
-        <base>&build_dir;/&gcc-directory;;</base>
+        <base>&build_dir;/&gcc-directory;</base>
       </stageinfo>
       <!-- Run the following command:  expect -c "spawn ls"
 If you receive the message:

Modified: profiles/LFS/branches/gcc4/chapter05/glibc.xml
===================================================================
--- profiles/LFS/branches/gcc4/chapter05/glibc.xml	2005-08-26 19:40:29 UTC (rev 1979)
+++ profiles/LFS/branches/gcc4/chapter05/glibc.xml	2005-08-31 01:36:04 UTC (rev 1980)
@@ -78,8 +78,17 @@
         <prefix>PARALLELMFLAGS=&jlevel;</prefix>
       </make>
       <make>
+<!--        <param>-k</param>
+            we expect 5 failurs -->
         <param>check</param>
+        <param> || make check</param>
+        <param> || make check</param>
+        <param> || make check</param>
+        <param> || make check</param>
+        <param> || make check</param>
+<!-- Anything more than the expected 5 errors stops the build -->
       </make>
+      
       <mkdir>
         <name>/tools/etc</name>
       </mkdir>
@@ -94,11 +103,11 @@
         <name>/tools/lib/locale</name>
       </mkdir>
  
-      <make>
+<!--      <make>
         <param>localedata/install-locales</param>
-      </make>
+      </make> -->
  
-<!--      <execute command="localedef -i de_DE -f ISO-8859-1 de_DE" />
+      <execute command="localedef -i de_DE -f ISO-8859-1 de_DE" />
       <execute command="localedef -i de_DE at euro -f ISO-8859-15 de_DE at euro" />
       <execute command="localedef -i en_HK -f ISO-8859-1 en_HK" />
       <execute command="localedef -i en_PH -f ISO-8859-1 en_PH" />
@@ -108,7 +117,7 @@
       <execute command="localedef -i fr_FR -f ISO-8859-1 fr_FR" />
       <execute command="localedef -i fr_FR at euro -f ISO-8859-15 fr_FR at euro" />
       <execute command="localedef -i it_IT -f ISO-8859-1 it_IT" />
-      <execute command="localedef -i ja_JP -f EUC-JP ja_JP" /> -->
+      <execute command="localedef -i ja_JP -f EUC-JP ja_JP" />
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&glibc-directory;</remove>

Modified: profiles/LFS/branches/gcc4/chapter06/coreutils.xml
===================================================================
--- profiles/LFS/branches/gcc4/chapter06/coreutils.xml	2005-08-26 19:40:29 UTC (rev 1979)
+++ profiles/LFS/branches/gcc4/chapter06/coreutils.xml	2005-08-31 01:36:04 UTC (rev 1980)
@@ -80,7 +80,6 @@
         <source>date</source>
         <source>echo</source>
         <source>false</source>
-        <source>head</source>
         <source>hostname</source>
         <source>ln</source>
         <source>ls</source>

Modified: profiles/LFS/branches/gcc4/chapter06/glibc.xml
===================================================================
--- profiles/LFS/branches/gcc4/chapter06/glibc.xml	2005-08-26 19:40:29 UTC (rev 1979)
+++ profiles/LFS/branches/gcc4/chapter06/glibc.xml	2005-08-31 01:36:04 UTC (rev 1980)
@@ -80,7 +80,14 @@
         <prefix>PARALLELMFLAGS=&jlevel;</prefix>
       </make>
       <make>
+<!--        <param>-k</param>
+            we expect 4 failurs -->
         <param>check</param>
+        <param> || make check</param>
+	<param> || make check</param>
+        <param> || make check</param>
+        <param> || make check</param>
+<!-- Anything more than the expected 4 errors stops the build -->
       </make>
       <execute command="touch">
         <param>/etc/ld.so.conf</param>
@@ -92,7 +99,7 @@
         <option>parents</option>
         <name>/usr/lib/locale</name>
       </mkdir>
-<!--      <execute command="localedef -i de_DE -f ISO-8859-1 de_DE" />
+      <execute command="localedef -i de_DE -f ISO-8859-1 de_DE" />
       <execute command="localedef -i de_DE at euro -f ISO-8859-15 de_DE at euro" />
       <execute command="localedef -i en_HK -f ISO-8859-1 en_HK" />
       <execute command="localedef -i en_PH -f ISO-8859-1 en_PH" />
@@ -102,10 +109,10 @@
       <execute command="localedef -i fr_FR -f ISO-8859-1 fr_FR" />
       <execute command="localedef -i fr_FR at euro -f ISO-8859-15 fr_FR at euro" />
       <execute command="localedef -i it_IT -f ISO-8859-1 it_IT" />
-      <execute command="localedef -i ja_JP -f EUC-JP ja_JP" /> -->
-      <make>
+      <execute command="localedef -i ja_JP -f EUC-JP ja_JP" />
+<!--      <make>
         <param>localedata/install-locales</param>
-      </make>
+      </make> -->
 
       <make>
         <param>-C ../&glibc-directory;/linuxthreads/man</param>

Modified: profiles/LFS/branches/gcc4/chapter06/readjustingtoolchain.xml
===================================================================
--- profiles/LFS/branches/gcc4/chapter06/readjustingtoolchain.xml	2005-08-26 19:40:29 UTC (rev 1979)
+++ profiles/LFS/branches/gcc4/chapter06/readjustingtoolchain.xml	2005-08-31 01:36:04 UTC (rev 1980)
@@ -22,25 +22,14 @@
     <remove>&build_dir;/&binutils-directory;</remove>
     <remove>&build_dir;/binutils-build</remove>
     <stage name="Amending the GCC specs File">
-<!--      <search_replace>
-        <file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
-        <find>/tools/lib/&glibc-loader;</find>
-        <replace>/lib/&glibc-loader;</replace>
-      </search_replace>
-
-      <execute command="perl">
-        <param>-pi -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;'</param>
-        <param>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</param>
-      </execute> 
--->
       <execute command="gcc">
         <param>-dumpspecs > </param>
-        <param>`gcc -print-search-dirs | head -n 1 | awk '{ print $2 "specs" }'`</param>
+        <param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
       </execute>
 
       <execute command="sed">
         <param>-i -e 's@^/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2 at g'</param>
-        <param>`gcc -print-search-dirs | head -n 1 | awk '{ print $2 "specs" }'`</param>
+        <param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
       </execute>
 
     </stage>

Modified: profiles/LFS/branches/gcc4/config/general.ent
===================================================================
--- profiles/LFS/branches/gcc4/config/general.ent	2005-08-26 19:40:29 UTC (rev 1979)
+++ profiles/LFS/branches/gcc4/config/general.ent	2005-08-31 01:36:04 UTC (rev 1980)
@@ -67,7 +67,7 @@
 <!ENTITY password "r00tme">
 
 <!-- LFS book version -->
-<!ENTITY LFS-version "SVN-6745">
+<!ENTITY LFS-version "SVN-6748">
 
 <!-- THE FOLLOWING THREE ENTITY DECLARATIONS SHOULDN'T BE MODIFIED
      UNLESS YOU KNOW WHAT YOU ARE DOING

Modified: profiles/LFS/branches/gcc4/config/package.ent
===================================================================
--- profiles/LFS/branches/gcc4/config/package.ent	2005-08-26 19:40:29 UTC (rev 1979)
+++ profiles/LFS/branches/gcc4/config/package.ent	2005-08-31 01:36:04 UTC (rev 1980)
@@ -186,8 +186,8 @@
 <!ENTITY libtool-package "libtool-&libtool-version;.tar.bz2">
 <!ENTITY libtool-directory "libtool-&libtool-version;">
 
-<!ENTITY libxml2-md5 "2d53bba9a4768ec57d8bf2bdadb75c87">
-<!ENTITY libxml2-version "2.6.17">
+<!ENTITY libxml2-md5 "342f722d1770071be19253f229fef677">
+<!ENTITY libxml2-version "2.6.20">
 <!ENTITY libxml2-package "libxml2-&libxml2-version;.tar.bz2">
 <!ENTITY libxml2-directory "libxml2-&libxml2-version;">
 
@@ -212,7 +212,7 @@
 <!ENTITY make-package "make-&make-version;.tar.bz2">
 <!ENTITY make-directory "make-&make-version;">
 
-<!ENTITY man-md5 "">
+<!ENTITY man-md5 "bf7229ad4f28e8eb06da1f1c8ea86763">
 <!ENTITY man-version "1.6a">
 <!ENTITY man-package "man-&man-version;.tar.bz2">
 <!ENTITY man-directory "man-&man-version;">




More information about the alfs-log mailing list