From 5a464e4d710e72657403d1d9c90210ce7c3454f9 Mon Sep 17 00:00:00 2001 From: Randy McMurchy Date: Fri, 25 Jan 2013 00:48:47 +0000 Subject: [PATCH] Minor changes to various packages git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10973 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general/genlib/libatasmart.xml | 6 +-- general/genlib/libical.xml | 7 +++- general/prog/php.xml | 16 ++++---- general/prog/tcl.xml | 4 +- general/prog/tk.xml | 4 +- general/sysutils/bluez.xml | 45 +++++++++++---------- gnome/core/libsecret.xml | 6 ++- multimedia/libdriv/gst-plugins-bad.xml | 4 +- multimedia/videoutils/mplayer.xml | 8 ++-- networking/netlibs/geoclue.xml | 2 +- postlfs/filesystems/fuse.xml | 54 +++++++++++++++++++++----- xincludes/static-libraries.xml | 2 +- 12 files changed, 100 insertions(+), 58 deletions(-) diff --git a/general/genlib/libatasmart.xml b/general/genlib/libatasmart.xml index ed64d37576..bffdcb79be 100644 --- a/general/genlib/libatasmart.xml +++ b/general/genlib/libatasmart.xml @@ -94,7 +94,7 @@ make Now, as the root user: -make install +make docdir=/usr/share/doc/libatasmart-&libatasmart-version; install @@ -136,7 +136,7 @@ make skdump - is an utility that reports on the status of the disk. + is a utility that reports on the status of the disk. skdump @@ -148,7 +148,7 @@ make sktest - is an utility to issue disks tests. + is a utility to issue disks tests. sktest diff --git a/general/genlib/libical.xml b/general/genlib/libical.xml index 577deaadd2..d66fdf136e 100644 --- a/general/genlib/libical.xml +++ b/general/genlib/libical.xml @@ -56,10 +56,11 @@ + User Notes: @@ -83,13 +84,15 @@ make + Contents diff --git a/general/prog/php.xml b/general/prog/php.xml index 66ac5d874c..17f0c65516 100644 --- a/general/prog/php.xml +++ b/general/prog/php.xml @@ -204,13 +204,13 @@ make install -v -m644 php.ini-production /etc/php.ini && install -v -m755 -d /usr/share/doc/php-&php-version; && -install -v -m644 CODING_STANDARDS EXTENSIONS INSTALL NEWS \ - README* UPGRADING* php.gif \ - /usr/share/doc/php-&php-version; && -ln -v -sfn /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt \ - /usr/share/doc/php-&php-version; && -ln -v -sfn /usr/lib/php/doc/Structures_Graph/docs \ - /usr/share/doc/php-&php-version; +install -v -m644 CODING_STANDARDS EXTENSIONS INSTALL NEWS \ + README* UPGRADING* php.gif \ + /usr/share/doc/php-&php-version; && +ln -v -sfn /usr/lib/php/doc/Archive_Tar/docs/Archive_Tar.txt \ + /usr/share/doc/php-&php-version; && +ln -v -sfn /usr/lib/php/doc/Structures_Graph/docs \ + /usr/share/doc/php-&php-version; The pre-built HTML documentation is packaged in two forms: a tarball containing many individual files, useful for quick loading into your @@ -272,7 +272,7 @@ gunzip -v /usr/share/doc/php-&php-version;/php_manual_en.html.gz--with-readline: This parameter enables command line Readline support. - --disable-libxml: This parameter + : This option allows building PHP without libxml2 installed. diff --git a/general/prog/tcl.xml b/general/prog/tcl.xml index 7886489675..66b7c11c6d 100644 --- a/general/prog/tcl.xml +++ b/general/prog/tcl.xml @@ -161,8 +161,8 @@ cp -v -r ../html/* /usr/share/doc/tcl-&tcl-version; Command Explanations - : This switch is used to enable 64 bit + $([ $(uname -m) = x86_64 ] && echo + --enable-64bit): This switch is used to enable 64 bit support in Tcl on 64 bit operating systems. diff --git a/general/prog/tk.xml b/general/prog/tk.xml index 680cbd0bf0..5bbc60a93b 100644 --- a/general/prog/tk.xml +++ b/general/prog/tk.xml @@ -127,8 +127,8 @@ chmod -v 755 /usr/lib/libtk&tk-ver;.so Command Explanations - : This switch is used to enable 64 bit + $([ $(uname -m) = x86_64 ] && echo + --enable-64bit): This switch is used to enable 64 bit support in Tk on 64 bit operating systems. diff --git a/general/sysutils/bluez.xml b/general/sysutils/bluez.xml index c0c801a133..ca624d1280 100644 --- a/general/sysutils/bluez.xml +++ b/general/sysutils/bluez.xml @@ -82,7 +82,7 @@ , , - , + , and @@ -163,7 +163,8 @@ make for CONFFILE in audio input network serial ; do install -v -m644 ${CONFFILE}/${CONFFILE}.conf /etc/bluetooth/${CONFFILE}.conf -done +done +unset CONFFILE If desired, install the API documentation as the @@ -179,71 +180,73 @@ install -v -m644 doc/*.txt /usr/share/doc/bluez-&bluez-version;Command Explanations - : This switch enables building of the BCCMD + --enable-bccmd: This switch enables building of the BCCMD interface utility. - : This switch enables building of the DFU + --enable-dfutool: This switch enables building of the DFU firmware upgrade utility. - : This switch enables building of the DUN daemon. + --enable-dund: This switch enables building of the DUN daemon. - : This switch enables building of the HID + --enable-hid2hci: This switch enables building of the HID mode switching utility. - : This switch enables building of the HID daemon. + --enable-hidd: This switch enables building of the HID daemon. - : This switch enables building of the PAN daemon. + --enable-pand: This switch enables building of the PAN daemon. - : This switch enables building of the Bluetooth + --enable-tools: This switch enables building of the Bluetooth utilities. - : This switch enables building of the Wii + --enable-wiimote: This switch enables building of the Wii Remote plugin. - : This switch disables installation of the + --disable-test: This switch disables installation of the test programs. - : This switch disables installation + --without-systemdunitdir: This switch disables installation of the systemd units. - : This switch enables ALSA support. Use if you + : This switch enables CUPS backend support. Note + that CUPS does not need to be installed for this support. + + + diff --git a/gnome/core/libsecret.xml b/gnome/core/libsecret.xml index 8b5b437f28..8d834cac55 100644 --- a/gnome/core/libsecret.xml +++ b/gnome/core/libsecret.xml @@ -91,7 +91,8 @@ Optional (Required for the testsuite) - and + , + and @@ -112,7 +113,8 @@ make - To test the results, issue: make check. + To test the results, issue: make -k check. The + JavaScript tests fail for unknown reasons. diff --git a/multimedia/libdriv/gst-plugins-bad.xml b/multimedia/libdriv/gst-plugins-bad.xml index e702546e93..26b91732ab 100644 --- a/multimedia/libdriv/gst-plugins-bad.xml +++ b/multimedia/libdriv/gst-plugins-bad.xml @@ -181,12 +181,12 @@ make --with-gtk=3.0: Build against GTK+ 3 - instead of the default GTK+ 2: recommended for a + instead of the default GTK+ 2; recommended for a GNOME Desktop. - : if the dependencies for the camera + --disable-examples: If the dependencies for the camera driver have been satisfied, the associated example code fails to build. diff --git a/multimedia/videoutils/mplayer.xml b/multimedia/videoutils/mplayer.xml index 3e120f95ce..b26a9552ed 100644 --- a/multimedia/videoutils/mplayer.xml +++ b/multimedia/videoutils/mplayer.xml @@ -190,8 +190,8 @@ (required for the GUI), LADSPA, libbs2b, - LIRC and - LIRC Client Daemon, + LIRC (and + LIRC Client Daemon), , and , and @@ -311,8 +311,8 @@ ln -sfv Clearlooks /usr/share/mplayer/skins/default installed . MPlayer includes a copy of the FFmpeg source and without this option it will statically compile the included version of FFmpeg into itself. Dynamically linking to a system installed - FFmpeg makes MPlayer and Mencoder about 9MB smaller. If MPlayer is crashy - or unstable linked to a system installed FFmpeg, try recompiling MPlayer + FFmpeg makes MPlayer and Mencoder about 9MB smaller. If MPlayer exhibits + unstable behavior linked to a system installed FFmpeg, try recompiling MPlayer without this option (it is always more thoroughly tested with the included FFmpeg). diff --git a/networking/netlibs/geoclue.xml b/networking/netlibs/geoclue.xml index 5749295fbe..5c239acab3 100644 --- a/networking/netlibs/geoclue.xml +++ b/networking/netlibs/geoclue.xml @@ -161,7 +161,7 @@ make - : This option installs + --libexecdir=/usr/lib/geoclue: This option installs GeoClue's private executables into /usr/lib/geoclue. diff --git a/postlfs/filesystems/fuse.xml b/postlfs/filesystems/fuse.xml index 1ef6e4f81b..e9dfd2efa9 100644 --- a/postlfs/filesystems/fuse.xml +++ b/postlfs/filesystems/fuse.xml @@ -97,6 +97,19 @@ Installation of Fuse + + + After the configure script has finished you will + see a warning shown below. You can safely disregard this warning. + + +configure: WARNING: +****************************************************************** +* Please install util-linux version 2.18 or later which supports * +* --fake and --no-canonicalize options in mount and umount * +****************************************************************** + + Install Fuse by running the following commands: @@ -105,6 +118,11 @@ ./configure --prefix=/usr --disable-static INIT_D_PATH=/tmp/init.d && make + + If you have installed and wish to build the API + documentation, issue doxygen doc/Doxyfile. + + This package does not come with a test suite. @@ -114,9 +132,24 @@ make make install && -mv -v /usr/lib/libfuse.so.* /lib && + +mv -v /usr/lib/libfuse.so.* /lib && ln -sfv ../../lib/libfuse.so.&fuse-version; /usr/lib/libfuse.so && -rm -rf /tmp/init.d +rm -rf /tmp/init.d && + +install -v -m755 -d /usr/share/doc/fuse-&fuse-version; && +install -v -m644 doc/{how-fuse-works,kernel.txt} \ + /usr/share/doc/fuse-&fuse-version; + + + If you built the API documentation, install it as the + root user by issuing the + following commands: + + +install -v -m755 -d /usr/share/doc/fuse-&fuse-version;/api && +install -v -m644 doc/html/* \ + /usr/share/doc/fuse-&fuse-version;/api @@ -126,17 +159,18 @@ rm -rf /tmp/init.d href="../../xincludes/static-libraries.xml"/> - INIT_D_PATH=/tmp/init.d: This parameter makes it - install its bootscript into /tmp/init.d. + INIT_D_PATH=/tmp/init.d: This parameter installs + the bootscript into /tmp/init.d as + a bootscript is not required. - mv -v /usr/lib/libfuse.so.* /lib: This moves - FUSE library to root filesystem - so that it is available at early boot in case - /usr is on seperate - partition and is built with system - FUSE. + mv -v /usr/lib/libfuse.so.* /lib: This moves the + FUSE library to the root filesystem + so that it is available early in the boot process in case + /usr is mounted on a separate + partition and is built with a system-installed + version of FUSE. diff --git a/xincludes/static-libraries.xml b/xincludes/static-libraries.xml index 54e2890722..ba9d543c13 100644 --- a/xincludes/static-libraries.xml +++ b/xincludes/static-libraries.xml @@ -6,6 +6,6 @@ $Date$ --> - : This switch prevents + --disable-static: This switch prevents installation of static versions of the libraries.