From 450e682e4cc1b8091ef8ee71b48f4093dbb005ae Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 3 Jun 2012 17:41:05 +0000 Subject: [PATCH] Add pkg-config-0.26-internal-glib Add popt-1.16 Fix problem building perl in some environments git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9871 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendices/dependencies.xml | 71 ++++++++++++++++++++++++ chapter01/changelog.xml | 19 +++++++ chapter01/whatsnew.xml | 8 +++ chapter03/packages.xml | 18 ++++++ chapter05/binutils-pass1.xml | 3 +- chapter05/perl.xml | 8 ++- chapter06/chapter06.xml | 2 + chapter06/kmod.xml | 6 +- chapter06/libpipeline.xml | 8 +-- chapter06/man-db.xml | 5 +- chapter06/pkgconfig.xml | 103 +++++++++++++++++++++++++++++++++++ chapter06/popt.xml | 94 ++++++++++++++++++++++++++++++++ chapter06/udev.xml | 6 +- general.ent | 4 +- packages.ent | 16 ++++++ prologue/why.xml | 14 +++++ 16 files changed, 361 insertions(+), 24 deletions(-) create mode 100644 chapter06/pkgconfig.xml create mode 100644 chapter06/popt.xml diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index b8d25ae9e..6eb478aaf 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -1548,6 +1548,77 @@ + + Pkg-config + + + &dependencies; + + + Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, + Popt, and Sed + + + + + &testsuites; + + + None + + + + + &before; + + + Kmod + + + + + &external; + + + None + + + + + Popt + + + &dependencies; + + + Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make + + + + + &testsuites; + + + Diffutils and Sed + + + + + &before; + + + Pkg-config + + + + + &external; + + + None + + + Procps diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index b44e0c75d..3bbae69bd 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,25 @@ --> + + 2012-06-03 + + + [bdubbs] - Add pkg-config-0.26-internal-glib to the + book. Fixes + #3105. + + + [bdubbs] - Add popt-1.16 to the book. + + + [bdubbs] - Update Chapter 5 perl instructions + for the LFS environment. Fixes + #3104. + + + + 2012-05-30 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index e40a7950d..25e8a76e0 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -251,6 +251,14 @@ &perl-libc-patch; + + pkg-config-&pkgconfig-version; + + + + popt&popt-version; + + diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 9a11aa714..9e1708a44 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -449,6 +449,24 @@ + + Pkg-config (&pkgconfig-version;) - &pkgconfig-size;: + + Home page: + Download: + MD5 sum: &pkgconfig-md5; + + + + + Popt (&popt-version;) - &popt-size;: + + Home page: + Download: + MD5 sum: &popt-md5; + + + Procps (&procps-version;) - &procps-size;: diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index b6de18b96..73e7948ac 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -76,8 +76,7 @@ cd ../binutils-build Now prepare Binutils for compilation: - -../binutils-&binutils-version;/configure \ +../binutils-&binutils-version;/configure \ --prefix=/tools \ --with-sysroot=$LFS \ --with-lib-path=/tools/lib \ diff --git a/chapter05/perl.xml b/chapter05/perl.xml index f59a2f7f8..dc279539a 100644 --- a/chapter05/perl.xml +++ b/chapter05/perl.xml @@ -48,13 +48,19 @@ patch -Np1 -i ../&perl-libc-patch; + The configuration script needs to be adjusted to run in the restricted + LFS environment: + +chmod -v 0775 Configure +sed -i -e '/Restore computed paths/i libswanted=""' Configure + Prepare Perl for compilation: sh Configure -des -Dprefix=/tools Build the package: -make +make CLDFLAGS='-lm' Although Perl comes with a test suite, it would be better to wait until it is insalled in the next chapter. diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 71a37a182..9ee047f98 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -46,6 +46,8 @@ + + diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml index 649cb76d3..f04f89303 100644 --- a/chapter06/kmod.xml +++ b/chapter06/kmod.xml @@ -43,11 +43,7 @@ Prepare Kmod for compilation: -liblzma_CFLAGS="-I/usr/include" \ -liblzma_LIBS="-L/lib -llzma" \ -zlib_CFLAGS="-I/usr/include" \ -zlib_LIBS="-L/lib -lz" \ -./configure --prefix=/usr \ +./configure --prefix=/usr \ --bindir=/bin \ --libdir=/lib \ --sysconfdir=/etc \ diff --git a/chapter06/libpipeline.xml b/chapter06/libpipeline.xml index 04bc472b4..e3e248760 100644 --- a/chapter06/libpipeline.xml +++ b/chapter06/libpipeline.xml @@ -43,10 +43,8 @@ Prepare Libpipeline for compilation: -./configure CHECK_CFLAGS=-I/tools/include \ - CHECK_LIBS="-L/tools/lib -lcheck" \ - --prefix=/usr - +./configure --prefix=/usr + Compile the package: make diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml index d5fa4f5bf..9adb42318 100644 --- a/chapter06/man-db.xml +++ b/chapter06/man-db.xml @@ -43,10 +43,7 @@ Prepare Man-DB for compilation: -PKG_CONFIG=/tools/bin/true \ -libpipeline_CFLAGS='' \ -libpipeline_LIBS='-lpipeline' \ -./configure --prefix=/usr \ +./configure --prefix=/usr \ --libexecdir=/usr/lib \ --docdir=/usr/share/doc/man-db-&man-db-version; \ --sysconfdir=/etc \ diff --git a/chapter06/pkgconfig.xml b/chapter06/pkgconfig.xml new file mode 100644 index 000000000..8419f1439 --- /dev/null +++ b/chapter06/pkgconfig.xml @@ -0,0 +1,103 @@ + + + %general-entities; +]> + + + + + + pkgconfig + &pkgconfig-version; +
&pkgconfig-url;
+ + + Pkg-config-&pkgconfig-version; + + + pkgconfig + + + + + + <para> The pkg-config package contains a tool for passing the include path + and/or library paths to build tools during the configure and make file + execution.</para> + + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> + + <seglistitem> + <seg>&pkgconfig-ch6-sbu;</seg> + <seg>&pkgconfig-ch6-du;</seg> + </seglistitem> + </segmentedlist> + + </sect2> + + <sect2 role="installation"> + <title>Installation of Pkg-config + + Prepare Pkg-config for compilation: + +./configure --prefix=/usr \ + --with-installed-popt \ + --with-internal-glib \ + --docdir=/usr/share/doc/pkg-config-&pkgconfig-version; + + + + Compile the package: + +make + + To test the results, issue: + +make check + + Install the package: + +make install + + + + + + Contents of Pkg-config + + + Installed program + Installed directory + + + pkg-config + /usr/share/doc/pkg-config-0.26 + + + + + Short Descriptions + + + + + + pkg-config + + returns meta information for the specified library or package. + + + pkg-config + + + + + + + + + diff --git a/chapter06/popt.xml b/chapter06/popt.xml new file mode 100644 index 000000000..1423f12d5 --- /dev/null +++ b/chapter06/popt.xml @@ -0,0 +1,94 @@ + + + %general-entities; +]> + + + + + + popt + &popt-version; +
&popt-url;
+ + + Popt-&popt-version; + + + popt + + + + + + <para>The Popt package contains a library used by some programs + to parse command-line options.</para> + + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> + + <seglistitem> + <seg>&popt-ch6-sbu;</seg> + <seg>&popt-ch6-du;</seg> + </seglistitem> + </segmentedlist> + + </sect2> + + <sect2 role="installation"> + <title>Installation of Popt + + Prepare Popt4 for compilation: + +./configure --prefix=/usr + + Compile the package: + +make + + To test the results, issue: + +make check + + Install the package: + +make install + + + + + + Contents of Popt + + + Installed libraries: + + + libpopt.{a,so} + + + + + Short Descriptions + + + + + + libpopt + + is used to parse command-line options. + + libpopt + + + + + + + + + diff --git a/chapter06/udev.xml b/chapter06/udev.xml index e779717b6..9ce3350c9 100644 --- a/chapter06/udev.xml +++ b/chapter06/udev.xml @@ -54,11 +54,7 @@ mknod -m0666 /lib/udev/devices/null c 1 3 Prepare the package for compilation: -BLKID_CFLAGS="-I/usr/include/blkid" \ -BLKID_LIBS="-L/lib -lblkid" \ -KMOD_CFLAGS="-I/usr/include" \ -KMOD_LIBS="-L/lib -lkmod" \ -./configure --prefix=/usr \ +./configure --prefix=/usr \ --with-rootprefix='' \ --bindir=/sbin \ --sysconfdir=/etc \ diff --git a/general.ent b/general.ent index b6d3bd9cc..75f5143a5 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index e1eafa6f1..da327bb28 100644 --- a/packages.ent +++ b/packages.ent @@ -429,6 +429,22 @@ + + + + + + + + + + + + + + + + diff --git a/prologue/why.xml b/prologue/why.xml index 9de025bc0..30e545c28 100644 --- a/prologue/why.xml +++ b/prologue/why.xml @@ -345,6 +345,20 @@ packages. + + Pkg-config + + This package provides a program to return meta-data about an + installed library or package. + + + + Popt + + This package is a library used by some programs to parse + command line inputs. + + Procps