1.1 --- a/Makefile.in Mon Apr 20 20:14:53 2009 +0000
1.2 +++ b/Makefile.in Mon Apr 20 21:10:03 2009 +0000
1.3 @@ -51,7 +51,6 @@
1.4 bash := @@bash@@
1.5 grep := @@grep@@
1.6 make := @@make@@
1.7 -awk := @@awk@@
1.8 sed := @@sed@@
1.9
1.10 ###############################################################################
1.11 @@ -139,7 +138,6 @@
1.12 echo "export bash=$(bash)"; \
1.13 echo "export grep=$(grep)"; \
1.14 echo "export make=$(make)"; \
1.15 - echo "export awk=$(awk)"; \
1.16 echo "export sed=$(sed)"; \
1.17 ) >paths.mk
1.18
2.1 --- a/configure Mon Apr 20 20:14:53 2009 +0000
2.2 +++ b/configure Mon Apr 20 21:10:03 2009 +0000
2.3 @@ -4,9 +4,8 @@
2.4 DATE=$( date +%Y%m%d )
2.5
2.6 # All absolutely required tools, one per line to ease diff.
2.7 -# See function 'has_or_abort, below, for syntax
2.8 +# See function 'has_or_abort', below, for syntax
2.9 # - Hopefully, if gcc is present, then all associated tools will be
2.10 -# - awk must be GNU awk
2.11 # - makeinfo for building docs, even if discarded later on
2.12 # - others obvious... :-/
2.13 #
2.14 @@ -44,7 +43,7 @@
2.15 install:install=GNU coreutils
2.16 make:make=^GNU Make
2.17 gcc
2.18 -awk:awk=^GNU Awk || gawk=^GNU Awk
2.19 +awk
2.20 bison
2.21 flex
2.22 makeinfo
3.1 --- a/scripts/build/internals.sh Mon Apr 20 20:14:53 2009 +0000
3.2 +++ b/scripts/build/internals.sh Mon Apr 20 21:10:03 2009 +0000
3.3 @@ -18,7 +18,6 @@
3.4 -e 's|@@CT_bash@@|'"${bash}"'|g;' \
3.5 -e 's|@@CT_grep@@|'"${grep}"'|g;' \
3.6 -e 's|@@CT_make@@|'"${make}"'|g;' \
3.7 - -e 's|@@CT_awk@@|'"${awk}"'|g;' \
3.8 -e 's|@@CT_sed@@|'"${sed}"'|g;' \
3.9 "${CT_LIB_DIR}/scripts/populate.in" \
3.10 >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
4.1 --- a/scripts/build/kernel/linux.sh Mon Apr 20 20:14:53 2009 +0000
4.2 +++ b/scripts/build/kernel/linux.sh Mon Apr 20 21:10:03 2009 +0000
4.3 @@ -47,7 +47,7 @@
4.4
4.5 # Only starting with 2.6.18 does headers_install is usable. We only
4.6 # have 2.6 version available, so only test for sublevel.
4.7 - k_sublevel=$("${awk}" '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile")
4.8 + k_sublevel=$(awk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile")
4.9 [ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers."
4.10
4.11 V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}"
5.1 --- a/scripts/build/mpfr.sh Mon Apr 20 20:14:53 2009 +0000
5.2 +++ b/scripts/build/mpfr.sh Mon Apr 20 21:10:03 2009 +0000
5.3 @@ -42,7 +42,7 @@
5.4 # See: http://sourceware.org/ml/crossgcc/2008-11/msg00046.html
5.5 # and: http://sourceware.org/ml/crossgcc/2008-11/msg00048.html
5.6 libtoolize_opt=
5.7 - case "$(libtoolize --version |head -n 1 |"${awk}" '{ print $(NF); }')" in
5.8 + case "$(libtoolize --version |head -n 1 |awk '{ print $(NF); }')" in
5.9 0.*) ;;
5.10 1.*) ;;
5.11 *) libtoolize_opt=-i;;
6.1 --- a/scripts/functions Mon Apr 20 20:14:53 2009 +0000
6.2 +++ b/scripts/functions Mon Apr 20 21:10:03 2009 +0000
6.3 @@ -743,8 +743,8 @@
6.4 CT_DoLog DEBUG " Saving environment and aliases"
6.5 # We must omit shell functions, and some specific bash variables
6.6 # that break when restoring the environment, later. We could do
6.7 - # all the processing in the gawk script, but a sed is easier...
6.8 - set |"${awk}" '
6.9 + # all the processing in the awk script, but a sed is easier...
6.10 + set |awk '
6.11 BEGIN { _p = 1; }
6.12 $0~/^[^ ]+ \(\)/ { _p = 0; }
6.13 _p == 1
7.1 --- a/scripts/saveSample.sh.in Mon Apr 20 20:14:53 2009 +0000
7.2 +++ b/scripts/saveSample.sh.in Mon Apr 20 21:10:03 2009 +0000
7.3 @@ -78,8 +78,8 @@
7.4 CT_DoAddFileToSample() {
7.5 source="$1"
7.6 dest="$2"
7.7 - inode_s=$(ls -i "${source}" |"${awk}" '{ print $1; }')
7.8 - inode_d=$(ls -i "${dest}" 2>/dev/null |"${awk}" '{ print $1; }' || true)
7.9 + inode_s=$(ls -i "${source}" |awk '{ print $1; }')
7.10 + inode_d=$(ls -i "${dest}" 2>/dev/null |awk '{ print $1; }' || true)
7.11 if [ "${inode_s}" != "${inode_d}" ]; then
7.12 cp "${source}" "${dest}"
7.13 fi