Changeset 73fdcb6

Timestamp:

Feb 21, 2006, 1:51:03 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Children:

73b79203

Parents:

982abb8

Message:

r944@server (orig r942): jim | 2005-12-20 07:50:56 -0800

r1156@server: jim | 2005-12-20 07:50:39 -0800
Fixed perl temp-system

Location:

temp-system

Files:

• 64/perl.xml (modified) (3 diffs)
• common/perl.xml (modified) (2 diffs)

temp-system/64/perl.xml

@@ -61 +61 @@
     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" \
@@ -73 +69 @@
     <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"
@@ -85 +85 @@
     <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>

temp-system/common/perl.xml

@@ -67 +67 @@
 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" \
@@ -81 +76 @@
     -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>