r2164 - in profiles/LFS/trunk: chapter05 chapter06

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Tue Nov 8 11:39:12 PST 2005


Author: thomasp
Date: 2005-11-08 12:39:07 -0700 (Tue, 08 Nov 2005)
New Revision: 2164

Modified:
   profiles/LFS/trunk/chapter05/adjustingtoolchain.xml
   profiles/LFS/trunk/chapter06/gcc.xml
Log:
fix major errors in the way the commands were written in the xml for adjustingtoolchain.xml in chapter05 and moved the sed's for ch6 gcc.xml to a new patching stage.

Modified: profiles/LFS/trunk/chapter05/adjustingtoolchain.xml
===================================================================
--- profiles/LFS/trunk/chapter05/adjustingtoolchain.xml	2005-11-07 19:42:07 UTC (rev 2163)
+++ profiles/LFS/trunk/chapter05/adjustingtoolchain.xml	2005-11-08 19:39:07 UTC (rev 2164)
@@ -38,13 +38,13 @@
 	<destination>`dirname $(gcc -print-libgcc-file-name)`/specs</destination>
       </move>
       <execute command="find">
-        <param>`dirname $(gcc -print-libgcc-file-name)`/include</param>
+        <param>`dirname $(gcc -print-libgcc-file-name)`/include/*</param>
         <param>-maxdepth 0 -xtype d -exec rm -rf '{}' \;</param>
       </execute>
       <execute command="rm">
         <param>-f</param> 
         <param>`grep -l 'DO NOT EDIT THIS FILE'</param>
-        <param>$(dirname $(gcc -print-libgcc-file-name)/include)/*`</param>
+        <param>$(dirname $(gcc -print-libgcc-file-name))/include/*`</param>
       </execute>
 
     <!-- Test basic functions of toolchain with:

Modified: profiles/LFS/trunk/chapter06/gcc.xml
===================================================================
--- profiles/LFS/trunk/chapter06/gcc.xml	2005-11-07 19:42:07 UTC (rev 2163)
+++ profiles/LFS/trunk/chapter06/gcc.xml	2005-11-08 19:39:07 UTC (rev 2164)
@@ -20,15 +20,11 @@
         <name>gcc-build</name>
       </mkdir>
     </stage>
-    <stage name="Installing">
+    <stage name="Patching">
       <stageinfo>
-        <environment>
-          <variable name="CFLAGS" />
-          <variable name="CXXFLAGS" />
-        </environment>
-        <base>&build_dir;/gcc-build</base>
+	<base>&build_dir;/&gcc-directory;</base>
       </stageinfo>
-      <search_replace base="&build_dir;/&gcc-directory;">
+      <search_replace>
         <file>libiberty/Makefile.in</file>
         <find>install_to_$(INSTALL_DEST)</find>
         <replace></replace>
@@ -40,7 +36,16 @@
       <execute command="sed">
         <param>-i 's@\./fixinc\.sh at -c true@'</param>
         <param>gcc/Makefile.in</param>
-      </execute>  
+      </execute>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+        </environment>
+        <base>&build_dir;/gcc-build</base>
+      </stageinfo>
       <configure command="../&gcc-directory;/configure">
         <param>--prefix=/usr</param>
         <param>--libexecdir=/usr/lib</param>




More information about the alfs-log mailing list