r926 - in trunk/BOOK: . temp-system/64 temp-system/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Dec 19 23:13:12 PST 2005


Author: jim
Date: 2005-12-20 00:13:10 -0700 (Tue, 20 Dec 2005)
New Revision: 926

Modified:
   trunk/BOOK/
   trunk/BOOK/temp-system/64/perl.xml
   trunk/BOOK/temp-system/common/perl.xml
Log:
 r1112 at server:  jim | 2005-12-19 09:05:55 -0800
 Updated sed for perl change



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1111
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1112
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/temp-system/64/perl.xml
===================================================================
--- trunk/BOOK/temp-system/64/perl.xml	2005-12-20 07:12:58 UTC (rev 925)
+++ trunk/BOOK/temp-system/64/perl.xml	2005-12-20 07:13:10 UTC (rev 926)
@@ -65,13 +65,10 @@
     xpointer="xpointer(//*[@os='l'])"/>
 
 <screen os="m"><userinput>cp config.sh{,.orig}
-sed -e "s@\(^ar=\).*@\1'${AR}'@g" config.sh.orig > config.sh
-cp config.sh{,.orig}
-sed -e "s@\(^ranlib=\).*@\1'${RANLIB}'@g" config.sh.orig > config.sh
-cp config.sh{,.orig}
-sed -e "s@\(^cc=\).*@\1'${CC} ${BUILD64}'@g" config.sh.orig > config.sh
-cp config.sh{,.orig}
-sed -e "s@\(^ld=\).*@\1'${CC} ${BUILD64}'@g" config.sh.orig > config.sh</userinput></screen>
+sed -e "s@\(^ar=\).*@\1'${AR}'@g" \
+    -e "s@\(^ranlib=\).*@\1'${RANLIB}'@g" \
+    -e "s@\(^cc=\).*@\1'${CC} ${BUILD64}'@g" \
+    -e "s@\(^ld=\).*@\1'${CC} ${BUILD64}'@g" config.sh.orig > config.sh</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"

Modified: trunk/BOOK/temp-system/common/perl.xml
===================================================================
--- trunk/BOOK/temp-system/common/perl.xml	2005-12-20 07:12:58 UTC (rev 925)
+++ trunk/BOOK/temp-system/common/perl.xml	2005-12-20 07:13:10 UTC (rev 926)
@@ -75,13 +75,10 @@
    cross-tools we have created:</para>
 
 <screen os="m"><userinput>cp config.sh{,.orig}
-sed -e "s@\(^ar=\).*@\1'${AR}'@g" config.sh.orig > config.sh
-cp config.sh{,.orig}
-sed -e "s@\(^ranlib=\).*@\1'${RANLIB}'@g" config.sh.orig > config.sh
-cp config.sh{,.orig}
-sed -e "s@\(^cc=\).*@\1'${CC} ${BUILD32}'@g" config.sh.orig > config.sh
-cp config.sh{,.orig}
-sed -e "s@\(^ld=\).*@\1'${CC} ${BUILD32}'@g" config.sh.orig > config.sh</userinput></screen>
+sed -e "s@\(^ar=\).*@\1'${AR}'@g" \
+    -e "s@\(^ranlib=\).*@\1'${RANLIB}'@g" \
+    -e "s@\(^cc=\).*@\1'${CC} ${BUILD32}'@g" \
+    -e "s@\(^ld=\).*@\1'${CC} ${BUILD32}'@g" config.sh.orig > config.sh</userinput></screen>
 
   <para os="n">Now we are ready to make our cross-compiled perl:</para>
 




More information about the cross-lfs mailing list