Author: jim
Date: 2006-06-28 13:53:33 -0600 (Wed, 28 Jun 2006)
New Revision: 1857
Modified:
/
trunk/BOOK/final-system/multilib/bzip2-64bit.xml
trunk/BOOK/final-system/multilib/bzip2-n32.xml
trunk/BOOK/temp-system/multilib/bzip2.xml
Log:
[EMAIL PROTECTED] (orig r1935): [EMAIL PROTECTED] | 2006-06-28 10:21:31 -0700
Corrected final-system multilib bzip2 installation so that tests are not
disabled
Property changes on:
___________________________________________________________________
Name: svk:merge
- b6734a72-470d-0410-b049-f317dca95413:/:1934
+ b6734a72-470d-0410-b049-f317dca95413:/:1935
Modified: trunk/BOOK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2-64bit.xml 2006-06-28 19:53:25 UTC
(rev 1856)
+++ trunk/BOOK/final-system/multilib/bzip2-64bit.xml 2006-06-28 19:53:33 UTC
(rev 1857)
@@ -45,12 +45,10 @@
href="../common/bzip2.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'p6'])"/>
- <para os="m1">We need to remove the tests since they won't work on
- a multi-architecture build, and change the default lib path
+ <para os="m1">We need to change the default lib path
to <filename class="directory">lib64</filename>:</para>
-<screen os="m2"><userinput>sed -i -e '[EMAIL PROTECTED](all:.*\) [EMAIL
PROTECTED]@g' \
- -e 's@/lib\(/\| \|$\)@/[EMAIL PROTECTED]' Makefile</userinput></screen>
+<screen os="m2"><userinput>sed -i 's@/lib\(/\| \|$\)@/[EMAIL PROTECTED]'
Makefile</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="bzip2.xml"
Modified: trunk/BOOK/final-system/multilib/bzip2-n32.xml
===================================================================
--- trunk/BOOK/final-system/multilib/bzip2-n32.xml 2006-06-28 19:53:25 UTC
(rev 1856)
+++ trunk/BOOK/final-system/multilib/bzip2-n32.xml 2006-06-28 19:53:33 UTC
(rev 1857)
@@ -22,12 +22,10 @@
<sect2 role="installation">
<title>Installation of Bzip2</title>
- <para os="m1">We need to remove the tests since they won't work on
- a multi-architecture build, and change the default lib path
+ <para os="m1">We need to change the default lib path
to <filename class="directory">lib32</filename>:</para>
-<screen os="m2"><userinput>sed -i -e '[EMAIL PROTECTED](all:.*\) [EMAIL
PROTECTED]@g' \
- -e 's@/lib\(/\| \|$\)@/[EMAIL PROTECTED]' Makefile</userinput></screen>
+<screen os="m2"><userinput>sed -i 's@/lib\(/\| \|$\)@/[EMAIL PROTECTED]'
Makefile</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="bzip2.xml"
Modified: trunk/BOOK/temp-system/multilib/bzip2.xml
===================================================================
--- trunk/BOOK/temp-system/multilib/bzip2.xml 2006-06-28 19:53:25 UTC (rev
1856)
+++ trunk/BOOK/temp-system/multilib/bzip2.xml 2006-06-28 19:53:33 UTC (rev
1857)
@@ -22,13 +22,12 @@
<sect2 role="installation">
<title>Installation of Bzip2</title>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../../final-system/multilib/bzip2-64bit.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'m1'])"/>
+ <para os="m1">We need to remove the tests since they won't work on
+ a multi-architecture build, and change the default lib path
+ to <filename class="directory">lib64</filename>:</para>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
- href="../../final-system/multilib/bzip2-64bit.xml"
- xpointer="xpointer(//[EMAIL PROTECTED]'m2'])"/>
+<screen os="m2"><userinput>sed -i -e '[EMAIL PROTECTED](all:.*\) [EMAIL
PROTECTED]@g' \
+ -e 's@/lib\(/\| \|$\)@/[EMAIL PROTECTED]' Makefile</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="../common/bzip2.xml"
--
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
