Fix ICA build and a couple of other miscellaneous issues. Patch courtesy of Pierre Labastie.

LFS/master.sh

@@ -172,9 +172,14 @@ chapter6_Makefiles() {
     cp chapter06/* chapter06$N
     for script in chapter06$N/* ; do
       # Overwrite existing symlinks, files, and dirs
-      sed -e 's/ln -sv/&f/g' \
-          -e 's/mv -v/&f/g' \
-          -e 's/mkdir -v/&p/g' -i ${script}
+      sed -e 's/ln *-sv/&f/g' \
+          -e 's/mv *-v/&f/g' \
+          -e 's/mkdir *-v/&p/g' -i ${script}
+      # Suppress the mod of "test-installation.pl" because now
+      # the library path points to /usr/lib
+      if [[ ${script} =~ glibc ]]; then
+          sed '/DL=/,/unset DL/d' -i ${script}
+      fi
       # Rename the scripts
       mv ${script} ${script}$N
     done
@@ -337,6 +342,9 @@ chapter78_Makefiles() {
               CHROOT_wrt_TouchTimestamp
             fi
             CHROOT_Unpack "$pkg_tarball"
+            # If using optimizations, use MAKEFLAGS (unless blacklisted)
+            # no setting of CFLAGS and friends.
+            [[ "$OPTIMIZE" != "0" ]] &&  wrt_makeflags "$name"
        ;;
     esac
 

common/blfs-tool-deps/905-docbook-xml

@@ -102,8 +102,10 @@ do
     "file:///etc/xml/docbook" \
     $PKG_DEST/etc/xml/catalog
 done
-export PKGDIR=/sources/docbook-xml
-packInstall
+if ! [ -z "$PKG_DEST" ]; then
+  export PKGDIR=/sources/docbook-xml
+  packInstall
+fi
 rm -rf $PKG_DEST
 cd ..
 rm -rf docbook-xml

common/libs/func_blfs_deps

@@ -196,9 +196,10 @@ EOF
     # Touch the tracking file.
     case $name in
       docbook-xml )  pkg_ver=DocBook-4.5 ;;
-      lynx )  pkg_ver=lynx-2.8.7 ;;
+      lynx )  pkg_ver=lynx-2.8.7rel.2 ;;
       tidy )  pkg_ver=html-tidy-cvs_20101110 ;;
       unzip ) pkg_ver=unzip-6.0 ;;
+      sqlite ) pkg_ver=sqlite-3.7.8 ;;
       * )     pkg_ver=$(echo $pkg_tarball | sed -e 's/.tar.*//;s/.tgz//;s/.zip//') ;;
     esac
     if [ "$PROGNAME" = "clfs2" ]; then

common/libs/func_check_version.sh

@@ -90,10 +90,7 @@ check_prerequisites() {      #
   check_version "2.6.25"  "`uname -r`"          "KERNEL"
   check_version "3.2"     "$BASH_VERSION"       "BASH"
   check_version "4.1.2"   "`gcc -dumpversion`"  "GCC"  
-  libcLib="`find /lib /lib64 -name libc.so.6 -print`"
-  libcVer="`/${libcLib} | head -n1`"
-  libcVer="${libcVer##*version }"
-  check_version "2.5.1"   "${libcVer%%,*}"        "GLIBC"
+  check_version "2.5.1"   "$(ldd --version  | head -n1 | awk '{print $NF}')"        "GLIBC"
   check_version "2.17"    "$(ld --version  | head -n1 | awk '{print $NF}')"    "BINUTILS"
   check_version "1.18"    "$(tar --version | head -n1 | cut -d" " -f4)"        "TAR"
   bzip2Ver="$(bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f8)"

common/libs/func_download_pkgs

@@ -121,7 +121,7 @@ get_sources() {              # Download file, write name to MISSING_FILES.DMP if
     fi
 
       # Good or bad we write the original md5sum to a file
-    echo "$MD5" >> MD5SUM
+    echo "$MD5" >> MD5SUMS
 
      # Copy the freshly downloaded file
      # to the source archive.