From 15c9e722d518599b172b20b427a3de3c870d5e30 Mon Sep 17 00:00:00 2001 From: George Boudreau Date: Tue, 21 Oct 2008 21:24:25 +0000 Subject: [PATCH] Added Perl and M4 as host requirements (code:Matthew Burgess) --- CLFS/master.sh | 2 +- common/libs/func_check_version.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CLFS/master.sh b/CLFS/master.sh index 1b96a46..efa3cd8 100644 --- a/CLFS/master.sh +++ b/CLFS/master.sh @@ -770,7 +770,7 @@ set -e # Add chroot commands if [ "$METHOD" = "chroot" ] ; then CHROOT_LOC="`whereis -b chroot | cut -d " " -f2`" - chroot=`cat chroot/*chroot* | \ + chroot=`cat chroot/???-chroot | \ sed -e "s@chroot@$CHROOT_LOC@" \ -e '/#!\/bin\/bash/d' \ -e '/^export/d' \ diff --git a/common/libs/func_check_version.sh b/common/libs/func_check_version.sh index ac1836a..cde0336 100644 --- a/common/libs/func_check_version.sh +++ b/common/libs/func_check_version.sh @@ -99,8 +99,10 @@ check_prerequisites() { # check_version "3.0" "$(gawk --version | head -n1 | cut -d" " -f3)" "GAWK" check_version "2.5" "$(grep --version | head -n1 | awk '{print $NF}')" "GREP" check_version "1.2.4" "$(gzip --version 2>&1 | head -n1 | cut -d" " -f2)" "GZIP" + check_version "1.4" "$(m4 --version 2>&1 | head -n1 | cut -d" " -f3)" "M4" check_version "3.79.1" "$(make --version | head -n1 | cut -d " " -f3 | cut -c1-4)" "MAKE" check_version "2.5.4" "$(patch --version | head -n1 | cut -d" " -f2)" "PATCH" + check_version "5.6.0" "$(perl -V:version | cut -f2 -d\')" "PERL" check_version "3.0.2" "$(sed --version | head -n1 | cut -d" " -f4)" "SED" check_version "4.8" "$(makeinfo --version | head -n1 | awk '{ print$NF }')" "TEXINFO"