ALFS-GCC4 20050902

[Filip Bartmann]

In the appendix I send the patch to profile ALFS-GCC4 with changes from
LFS-GCC4 20050902.

diff -Naur gcc4/chapter05/adjustingtoolchain.xml gcc4_ch/chapter05/adjustingtoolchain.xml
--- gcc4/chapter05/adjustingtoolchain.xml	2005-09-03 10:45:47.000000000 +0200
+++ gcc4_ch/chapter05/adjustingtoolchain.xml	2005-09-03 10:56:34.000000000 +0200
@@ -26,13 +26,17 @@
       <param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
       </execute>
       <execute command="sed">
-        <param>-i -e '[EMAIL PROTECTED]/lib/ld-linux.so.2@/tools&amp;@g'</param>
-        <param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
+        <param>'[EMAIL PROTECTED]/lib/ld-linux.so.2@/tools&amp;@g'</param>
+        <param>`dirname $(gcc -print-libgcc-file-name)`/specs &gt; tempspecfile </param>
+      </execute>
+      <execute command="mv">
+	<param>-f</param>
+        <param>tempspecfile</param>
+	<param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
       </execute>
       <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>
+        <param>`dirname $(gcc -print-libgcc-file-name)`/include</param>
+        <param>-maxdepth 0 -xtype d -exec rm -rf '{}' \;</param>
       </execute>
 
       <execute command="rm">
diff -Naur gcc4/chapter05/gcc-pass2.xml gcc4_ch/chapter05/gcc-pass2.xml
--- gcc4/chapter05/gcc-pass2.xml	2005-09-03 10:46:00.000000000 +0200
+++ gcc4_ch/chapter05/gcc-pass2.xml	2005-09-03 10:10:29.000000000 +0200
@@ -40,7 +40,7 @@
       </copy>
       <execute command="sed">
         <param>'[EMAIL PROTECTED](^NATIVE_SYSTEM_HEADER_DIR =\)[EMAIL PROTECTED] /tools/[EMAIL PROTECTED]'</param>
-        <param>gcc/Makefile.in.orig > gcc/Makefile.in</param>
+        <param>gcc/Makefile.in.orig &gt; gcc/Makefile.in</param>
       </execute>
       <copy>
 	<source>gcc/Makefile.in</source>
@@ -48,7 +48,7 @@
       </copy>
       <execute command="sed">
         <param>'s/^XCFLAGS =$/&real-amp; -fomit-frame-pointer/'</param>
-        <param>gcc/Makefile.in.tmp > gcc/Makefile.in</param>
+        <param>gcc/Makefile.in.tmp &gt; gcc/Makefile.in</param>
       </execute>
       <patch>
         <param>-N</param>
diff -Naur gcc4/chapter06/readjustingtoolchain.xml gcc4_ch/chapter06/readjustingtoolchain.xml
--- gcc4/chapter06/readjustingtoolchain.xml	2005-09-03 10:46:41.000000000 +0200
+++ gcc4_ch/chapter06/readjustingtoolchain.xml	2005-09-03 10:07:46.000000000 +0200
@@ -28,7 +28,7 @@
       </execute>
 
       <execute command="sed">
-        <param>-i -e '[EMAIL PROTECTED]/tools/lib/ld-linux.so.2@/lib/[EMAIL PROTECTED]'</param>
+        <param>-i '[EMAIL PROTECTED]/tools/lib/ld-linux.so.2@/lib/[EMAIL PROTECTED]'</param>
         <param>`dirname $(gcc -print-libgcc-file-name)`/specs</param>
       </execute>
 
diff -Naur gcc4/chapter06/util-linux.xml gcc4_ch/chapter06/util-linux.xml
--- gcc4/chapter06/util-linux.xml	2005-09-03 10:46:50.000000000 +0200
+++ gcc4_ch/chapter06/util-linux.xml	2005-09-03 09:41:39.000000000 +0200
@@ -35,7 +35,7 @@
         <param>-i &packages_dir;/&util-linux-cramfs-patch;</param>
       </patch>
       <search_replace>
-       <file>MCONFIG</file>
+       <file>configure</file>
        <find>-O2</find>
        <replace>-O</replace>
       </search_replace>

-- 
http://linuxfromscratch.org/mailman/listinfo/alfs-discuss
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page