Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/appendices/dependencies/common.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -1484,5 +1484,5 @@
- Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep,
+ Bash, Binutils, Bzip2, Coreutils, Glibc, Gawk, GCC, Grep,
Make, Sed
Index: BOOK/final-system/common/perl.xml
===================================================================
--- BOOK/final-system/common/perl.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/common/perl.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -26,12 +26,11 @@
Installation of Perl
- By default, Perl's Compress::Raw::Zlib module builds and
- links against its own internal copy of Zlib. The following command will
- tell it to use the system-installed Zlib:
-
-sed -i -e '/^BUILD_ZLIB/s/True/False/' \
- -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
- -e '/^LIB/s,\./zlib-src,/usr/lib,' \
- cpan/Compress-Raw-Zlib/config.in
+ By default, Perl's Compress::Raw::Zlib and
+ Compress::Raw::Bzip2 modules build and link against internal copies of
+ Zlib and Bzip2. The following command will make Perl use the
+ system-installed copies of these libraries:
+
+export BUILD_ZLIB=False
+export BUILD_BZIP2=0
@@ -106,7 +105,8 @@
make test
- Install the package:
-
-make install
+ Install the package and remove the variables set previously:
+
+make install
+unset BUILD_ZLIB BUILD_BZIP2
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/mips-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -42,4 +42,5 @@
+
@@ -49,5 +50,4 @@
-
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/mips64-64-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -42,4 +42,5 @@
+
@@ -49,5 +50,4 @@
-
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/mips64-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -71,4 +71,7 @@
+
+
+
@@ -84,7 +87,4 @@
-
-
-
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/ppc-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -42,4 +42,5 @@
+
@@ -49,5 +50,4 @@
-
Index: BOOK/final-system/ppc64-64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-64-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/ppc64-64-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -42,4 +42,5 @@
+
@@ -49,5 +50,4 @@
-
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/ppc64-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -57,4 +57,6 @@
+
+
@@ -67,6 +69,4 @@
-
-
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/sparc-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -42,4 +42,5 @@
+
@@ -49,5 +50,4 @@
-
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/sparc64-64-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -42,4 +42,5 @@
+
@@ -49,5 +50,4 @@
-
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/sparc64-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -57,4 +57,6 @@
+
+
@@ -67,6 +69,4 @@
-
-
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/x86-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -42,4 +42,5 @@
+
@@ -49,5 +50,4 @@
-
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/x86_64-64-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -42,4 +42,5 @@
+
@@ -49,5 +50,4 @@
-
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/final-system/x86_64-chapter.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -57,4 +57,6 @@
+
+
@@ -67,6 +69,4 @@
-
-
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml (revision 147a241c6bc2c044d7587c27978656b2c52e8989)
+++ BOOK/introduction/common/changelog.xml (revision 9cc06dba6d03843455f0a8bb4a0604dede0e3659)
@@ -47,4 +47,8 @@
system, so that Ncurses will install .pc files.
+
+ [Chris] - Move Bzip2 before Perl and modify Perl instructions
+ to use system-install Bzip2. Solution borrowed from LFS.
+