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

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Dec 20 07:50:57 PST 2005


Author: jim
Date: 2005-12-20 08:50:56 -0700 (Tue, 20 Dec 2005)
New Revision: 942

Modified:
   trunk/BOOK/
   trunk/BOOK/temp-system/64/perl.xml
   trunk/BOOK/temp-system/common/perl.xml
Log:
 r1156 at server:  jim | 2005-12-20 07:50:39 -0800
 Fixed perl temp-system



Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1152
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1156
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 08:11:03 UTC (rev 941)
+++ trunk/BOOK/temp-system/64/perl.xml	2005-12-20 15:50:56 UTC (rev 942)
@@ -60,11 +60,7 @@
     href="../common/perl.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>cp config.sh{,.orig}
+<screen os="k"><userinput>cp config.sh{,.orig}
 sed -e "s@\(^ar=\).*@\1'${AR}'@g" \
     -e "s@\(^ranlib=\).*@\1'${RANLIB}'@g" \
     -e "s@\(^cc=\).*@\1'${CC} ${BUILD64}'@g" \
@@ -72,10 +68,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
+    xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
     xpointer="xpointer(//*[@os='o'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -84,8 +84,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
+    xpointer="xpointer(//*[@os='r'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/perl.xml"
+    xpointer="xpointer(//*[@os='s'])"/>
+
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/temp-system/common/perl.xml
===================================================================
--- trunk/BOOK/temp-system/common/perl.xml	2005-12-20 08:11:03 UTC (rev 941)
+++ trunk/BOOK/temp-system/common/perl.xml	2005-12-20 15:50:56 UTC (rev 942)
@@ -66,28 +66,32 @@
 mv miniperl miniperl-cross
 make clean</userinput></screen>
 
-    <para os="j">We will now edit the main Makefile to use our newly created miniperl-cross:</para>
-
-<screen os="k"><userinput>cp Makefile{,.orig}
-sed -e 's|(LDLIBPTH) ./miniperl|(LDLIBPTH) ./miniperl-cross|g' Makefile.orig > Makefile</userinput></screen>
-
-   <para os="l">We will now make perl cross-compile friendly by forcing it to use our
+   <para os="j">We will now make perl cross-compile friendly by forcing it to use our
    cross-tools we have created:</para>
 
-<screen os="m"><userinput>cp config.sh{,.orig}
+<screen os="k"><userinput>cp config.sh{,.orig}
 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>
+<para os="l">Now we will make miniperl for our architecture:</para>
 
-<screen os="o"><userinput>make miniperl
+<screen os="m"><userinput>make miniperl</userinput></screen>
+
+    <para os="n">We will now edit the main Makefile to use our newly created miniperl-cross:</para>
+
+<screen os="o"><userinput>cp Makefile{,.orig}
+sed -e 's|(LDLIBPTH) ./miniperl|(LDLIBPTH) ./miniperl-cross|g' Makefile.orig > Makefile</userinput></screen>
+
+  <para os="p">Now we are ready to make our cross-compiled perl:</para>
+
+<screen os="q"><userinput>make miniperl
 make perl utilities</userinput></screen>
 
-    <para os="p">Install these tools and their libraries:</para>
+    <para os="r">Install these tools and their libraries:</para>
 
-<screen os="q"><userinput>cp perl pod/pod2man /tools/bin
+<screen os="s"><userinput>cp perl pod/pod2man /tools/bin
 install -d /tools/lib/perl5/&perl-version;
 cp -R lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
 




More information about the cross-lfs mailing list