[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-3.0.0-rc1-sysvinit-15-g9cc06db
git
git at cross-lfs.org
Fri Aug 1 22:50:58 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, sysvinit has been updated
via 9cc06dba6d03843455f0a8bb4a0604dede0e3659 (commit)
via 147a241c6bc2c044d7587c27978656b2c52e8989 (commit)
via 0cf5e9cff4318708d923200eafcf22ba370ee1df (commit)
from ef74c41f4d00ee6dafb1d6c2f73254a276be5612 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9cc06dba6d03843455f0a8bb4a0604dede0e3659
Author: Chris Staub <chris at beaker67.com>
Date: Sat Aug 2 01:50:25 2014 -0400
Make Perl use system-installed bzip2 as well
diff --git a/BOOK/appendices/dependencies/common.xml b/BOOK/appendices/dependencies/common.xml
index 1986d3d..c99d7ab 100644
--- a/BOOK/appendices/dependencies/common.xml
+++ b/BOOK/appendices/dependencies/common.xml
@@ -1483,7 +1483,7 @@
<segtitle>&dependencies;</segtitle>
<seglistitem>
- <seg>Bash, Binutils, Coreutils, Glibc, Gawk, GCC, Grep,
+ <seg>Bash, Binutils, Bzip2, Coreutils, Glibc, Gawk, GCC, Grep,
Make, Sed</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/final-system/common/perl.xml b/BOOK/final-system/common/perl.xml
index dc0976d..b6c57d2 100644
--- a/BOOK/final-system/common/perl.xml
+++ b/BOOK/final-system/common/perl.xml
@@ -25,14 +25,13 @@
<sect2 role="installation">
<title>Installation of Perl</title>
- <para os="s3">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:</para>
+ <para os="s3">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:</para>
-<screen os="s4"><userinput>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</userinput></screen>
+<screen os="s4"><userinput>export BUILD_ZLIB=False
+export BUILD_BZIP2=0</userinput></screen>
<note os="a00">
<para>If you are following the boot method you will need to enable the
@@ -105,9 +104,10 @@
<screen os="h2"><userinput remap="test">make test</userinput></screen>
- <para os="j">Install the package:</para>
+ <para os="j">Install the package and remove the variables set previously:</para>
-<screen os="k"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make install
+unset BUILD_ZLIB BUILD_BZIP2</userinput></screen>
</sect2>
diff --git a/BOOK/final-system/mips-chapter.xml b/BOOK/final-system/mips-chapter.xml
index 98988cd..ec90c73 100644
--- a/BOOK/final-system/mips-chapter.xml
+++ b/BOOK/final-system/mips-chapter.xml
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
@@ -48,7 +49,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
diff --git a/BOOK/final-system/mips64-64-chapter.xml b/BOOK/final-system/mips64-64-chapter.xml
index 17ea58b..b3aa8fb 100644
--- a/BOOK/final-system/mips64-64-chapter.xml
+++ b/BOOK/final-system/mips64-64-chapter.xml
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
@@ -48,7 +49,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
diff --git a/BOOK/final-system/mips64-chapter.xml b/BOOK/final-system/mips64-chapter.xml
index 4fa04d0..90801fb 100644
--- a/BOOK/final-system/mips64-chapter.xml
+++ b/BOOK/final-system/mips64-chapter.xml
@@ -70,6 +70,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-n32.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-n32.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
@@ -83,9 +86,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-n32.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-n32.xml"/>
diff --git a/BOOK/final-system/ppc-chapter.xml b/BOOK/final-system/ppc-chapter.xml
index 7d2828f..ed5a259 100644
--- a/BOOK/final-system/ppc-chapter.xml
+++ b/BOOK/final-system/ppc-chapter.xml
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
@@ -48,7 +49,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
diff --git a/BOOK/final-system/ppc64-64-chapter.xml b/BOOK/final-system/ppc64-64-chapter.xml
index 0c46022..c33eb35 100644
--- a/BOOK/final-system/ppc64-64-chapter.xml
+++ b/BOOK/final-system/ppc64-64-chapter.xml
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
@@ -48,7 +49,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
diff --git a/BOOK/final-system/ppc64-chapter.xml b/BOOK/final-system/ppc64-chapter.xml
index 1054aee..a475dff 100644
--- a/BOOK/final-system/ppc64-chapter.xml
+++ b/BOOK/final-system/ppc64-chapter.xml
@@ -56,6 +56,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
@@ -66,8 +68,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-64bit.xml"/>
diff --git a/BOOK/final-system/sparc-chapter.xml b/BOOK/final-system/sparc-chapter.xml
index 014a8f0..c4921c6 100644
--- a/BOOK/final-system/sparc-chapter.xml
+++ b/BOOK/final-system/sparc-chapter.xml
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
@@ -48,7 +49,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
diff --git a/BOOK/final-system/sparc64-64-chapter.xml b/BOOK/final-system/sparc64-64-chapter.xml
index 46514ea..7527ba4 100644
--- a/BOOK/final-system/sparc64-64-chapter.xml
+++ b/BOOK/final-system/sparc64-64-chapter.xml
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
@@ -48,7 +49,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
diff --git a/BOOK/final-system/sparc64-chapter.xml b/BOOK/final-system/sparc64-chapter.xml
index 23f9372..5e43133 100644
--- a/BOOK/final-system/sparc64-chapter.xml
+++ b/BOOK/final-system/sparc64-chapter.xml
@@ -56,6 +56,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
@@ -66,8 +68,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-64bit.xml"/>
diff --git a/BOOK/final-system/x86-chapter.xml b/BOOK/final-system/x86-chapter.xml
index 50c709d..26e8285 100644
--- a/BOOK/final-system/x86-chapter.xml
+++ b/BOOK/final-system/x86-chapter.xml
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
@@ -48,7 +49,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
diff --git a/BOOK/final-system/x86_64-64-chapter.xml b/BOOK/final-system/x86_64-64-chapter.xml
index bdf8787..8e39dc4 100644
--- a/BOOK/final-system/x86_64-64-chapter.xml
+++ b/BOOK/final-system/x86_64-64-chapter.xml
@@ -41,6 +41,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/readline.xml"/>
@@ -48,7 +49,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
diff --git a/BOOK/final-system/x86_64-chapter.xml b/BOOK/final-system/x86_64-chapter.xml
index c7a685c..f2eb2d4 100644
--- a/BOOK/final-system/x86_64-chapter.xml
+++ b/BOOK/final-system/x86_64-chapter.xml
@@ -56,6 +56,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libtool-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/iproute2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gdbm-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/perl.xml"/>
@@ -66,8 +68,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/automake.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bc.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/bzip2-64bit.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/file-64bit.xml"/>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index d265e93..2ed4387 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -46,6 +46,10 @@
<para>[Chris] - Build Pkg-config-lite before Ncurses in the final
system, so that Ncurses will install .pc files.</para>
</listitem>
+ <listitem>
+ <para>[Chris] - Move Bzip2 before Perl and modify Perl instructions
+ to use system-install Bzip2. Solution borrowed from LFS.</para>
+ </listitem>
</itemizedlist>
</listitem>
commit 147a241c6bc2c044d7587c27978656b2c52e8989
Author: Chris Staub <chris at beaker67.com>
Date: Fri Aug 1 23:40:43 2014 -0400
Ncurses now depends on pkg-config
diff --git a/BOOK/appendices/dependencies/common.xml b/BOOK/appendices/dependencies/common.xml
index e297fd3..1986d3d 100644
--- a/BOOK/appendices/dependencies/common.xml
+++ b/BOOK/appendices/dependencies/common.xml
@@ -1428,7 +1428,7 @@
<seglistitem>
<seg>Bash, Binutils, Coreutils, Diffutils, Glibc, Gawk, GCC, Grep,
- Make, Sed</seg>
+ Make, Pkg-config-lite, Sed</seg>
</seglistitem>
</segmentedlist>
commit 0cf5e9cff4318708d923200eafcf22ba370ee1df
Author: Chris Staub <chris at beaker67.com>
Date: Fri Aug 1 23:40:13 2014 -0400
Added pc-files switch to multilib ncurses builds
diff --git a/BOOK/final-system/multilib/ncurses-64bit.xml b/BOOK/final-system/multilib/ncurses-64bit.xml
index c8d05c5..71a5b50 100644
--- a/BOOK/final-system/multilib/ncurses-64bit.xml
+++ b/BOOK/final-system/multilib/ncurses-64bit.xml
@@ -36,7 +36,7 @@
<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
./configure --prefix=/usr --libdir=/lib64 \
--with-shared --without-debug --enable-widec \
- --with-manpage-format=normal \
+ --with-manpage-format=normal --enable-pc-files \
--with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/ncurses-n32.xml b/BOOK/final-system/multilib/ncurses-n32.xml
index 2e827f9..bf4ab3b 100644
--- a/BOOK/final-system/multilib/ncurses-n32.xml
+++ b/BOOK/final-system/multilib/ncurses-n32.xml
@@ -37,7 +37,7 @@
<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
./configure --prefix=/usr --libdir=/lib32 \
--with-shared --without-debug --enable-widec \
- --with-manpage-format=normal \
+ --with-manpage-format=normal --enable-pc-files \
--with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/multilib/ncurses.xml b/BOOK/final-system/multilib/ncurses.xml
index 0232ad9..f50d09a 100644
--- a/BOOK/final-system/multilib/ncurses.xml
+++ b/BOOK/final-system/multilib/ncurses.xml
@@ -37,7 +37,7 @@
<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
./configure --prefix=/usr --libdir=/lib \
--with-shared --without-debug --enable-widec \
- --with-manpage-format=normal \
+ --with-manpage-format=normal --enable-pc-files \
--with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-----------------------------------------------------------------------
Summary of changes:
BOOK/appendices/dependencies/common.xml | 4 ++--
BOOK/final-system/common/perl.xml | 18 +++++++++---------
BOOK/final-system/mips-chapter.xml | 2 +-
BOOK/final-system/mips64-64-chapter.xml | 2 +-
BOOK/final-system/mips64-chapter.xml | 6 +++---
BOOK/final-system/multilib/ncurses-64bit.xml | 2 +-
BOOK/final-system/multilib/ncurses-n32.xml | 2 +-
BOOK/final-system/multilib/ncurses.xml | 2 +-
BOOK/final-system/ppc-chapter.xml | 2 +-
BOOK/final-system/ppc64-64-chapter.xml | 2 +-
BOOK/final-system/ppc64-chapter.xml | 4 ++--
BOOK/final-system/sparc-chapter.xml | 2 +-
BOOK/final-system/sparc64-64-chapter.xml | 2 +-
BOOK/final-system/sparc64-chapter.xml | 4 ++--
BOOK/final-system/x86-chapter.xml | 2 +-
BOOK/final-system/x86_64-64-chapter.xml | 2 +-
BOOK/final-system/x86_64-chapter.xml | 4 ++--
BOOK/introduction/common/changelog.xml | 4 ++++
18 files changed, 35 insertions(+), 31 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list