r1554 - profiles/LFS/trunk/chapter06

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Thu Oct 7 16:33:13 PDT 2004


Author: thomasp
Date: 2004-10-07 17:33:11 -0600 (Thu, 07 Oct 2004)
New Revision: 1554

Modified:
   profiles/LFS/trunk/chapter06/adjustingtoolchain.xml
   profiles/LFS/trunk/chapter06/createfiles.xml
Log:
added missing symlink and fixed startfile_prefix_spec sed

Modified: profiles/LFS/trunk/chapter06/adjustingtoolchain.xml
===================================================================
--- profiles/LFS/trunk/chapter06/adjustingtoolchain.xml	2004-10-03 22:09:36 UTC (rev 1553)
+++ profiles/LFS/trunk/chapter06/adjustingtoolchain.xml	2004-10-07 23:33:11 UTC (rev 1554)
@@ -32,13 +32,10 @@
     <replace> /lib/&glibc-loader;</replace>
   </search_replace>
 
-  <search_replace>
-    <file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
-    <find>*startfile_prefix_spec:</find>
-    <replace>*startfile_prefix_spec:
-/usr/lib</replace>
-  </search_replace>
-
+  <execute command="perl">
+    <param>-pi -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/@g;'</param>
+    <param>/tools/lib/gcc/&gcc_target;/&gc-version;/specs</param>
+  </execute>
 </stage>
 
 <!-- Test basic functions of toolchain with:

Modified: profiles/LFS/trunk/chapter06/createfiles.xml
===================================================================
--- profiles/LFS/trunk/chapter06/createfiles.xml	2004-10-03 22:09:36 UTC (rev 1553)
+++ profiles/LFS/trunk/chapter06/createfiles.xml	2004-10-07 23:33:11 UTC (rev 1554)
@@ -21,6 +21,7 @@
 
 	<link>
 		<option>force</option>
+		<target>/tools/lib/libgcc_s.so</target>
 		<target>/tools/lib/libgcc_s.so.1</target>
 		<name>/usr/lib</name>
 	</link>




More information about the alfs-log mailing list