summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.in2
-rwxr-xr-xconfigure5
-rw-r--r--scripts/build/internals.sh1
-rw-r--r--scripts/build/kernel/linux.sh2
-rw-r--r--scripts/build/mpfr.sh2
-rw-r--r--scripts/functions4
-rw-r--r--scripts/saveSample.sh.in4
7 files changed, 8 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in
index 32c9a1e..cb2bf42 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,7 +51,6 @@ install:= @@install@@
bash := @@bash@@
grep := @@grep@@
make := @@make@@
-awk := @@awk@@
sed := @@sed@@
###############################################################################
@@ -139,7 +138,6 @@ paths.mk:
echo "export bash=$(bash)"; \
echo "export grep=$(grep)"; \
echo "export make=$(make)"; \
- echo "export awk=$(awk)"; \
echo "export sed=$(sed)"; \
) >paths.mk
diff --git a/configure b/configure
index 39d0e7d..cb22ca0 100755
--- a/configure
+++ b/configure
@@ -4,9 +4,8 @@ VERSION=$( cat .version )
DATE=$( date +%Y%m%d )
# All absolutely required tools, one per line to ease diff.
-# See function 'has_or_abort, below, for syntax
+# See function 'has_or_abort', below, for syntax
# - Hopefully, if gcc is present, then all associated tools will be
-# - awk must be GNU awk
# - makeinfo for building docs, even if discarded later on
# - others obvious... :-/
#
@@ -44,7 +43,7 @@ xargs
install:install=GNU coreutils
make:make=^GNU Make
gcc
-awk:awk=^GNU Awk || gawk=^GNU Awk
+awk
bison
flex
makeinfo
diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh
index 575f07d..acaf864 100644
--- a/scripts/build/internals.sh
+++ b/scripts/build/internals.sh
@@ -18,7 +18,6 @@ do_finish() {
-e 's|@@CT_bash@@|'"${bash}"'|g;' \
-e 's|@@CT_grep@@|'"${grep}"'|g;' \
-e 's|@@CT_make@@|'"${make}"'|g;' \
- -e 's|@@CT_awk@@|'"${awk}"'|g;' \
-e 's|@@CT_sed@@|'"${sed}"'|g;' \
"${CT_LIB_DIR}/scripts/populate.in" \
>"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate"
diff --git a/scripts/build/kernel/linux.sh b/scripts/build/kernel/linux.sh
index 7e40fac..fa6a9dd 100644
--- a/scripts/build/kernel/linux.sh
+++ b/scripts/build/kernel/linux.sh
@@ -47,7 +47,7 @@ do_kernel_install() {
# Only starting with 2.6.18 does headers_install is usable. We only
# have 2.6 version available, so only test for sublevel.
- k_sublevel=$("${awk}" '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile")
+ k_sublevel=$(awk '/^SUBLEVEL =/ { print $3 }' "${CT_SRC_DIR}/linux-${CT_KERNEL_VERSION}/Makefile")
[ ${k_sublevel} -ge 18 ] || CT_Abort "Kernel version >= 2.6.18 is needed to install kernel headers."
V_OPT="V=${CT_KERNEL_LINUX_VERBOSE_LEVEL}"
diff --git a/scripts/build/mpfr.sh b/scripts/build/mpfr.sh
index 2ff3f5b..e302ff7 100644
--- a/scripts/build/mpfr.sh
+++ b/scripts/build/mpfr.sh
@@ -42,7 +42,7 @@ do_mpfr_extract() {
# See: http://sourceware.org/ml/crossgcc/2008-11/msg00046.html
# and: http://sourceware.org/ml/crossgcc/2008-11/msg00048.html
libtoolize_opt=
- case "$(libtoolize --version |head -n 1 |"${awk}" '{ print $(NF); }')" in
+ case "$(libtoolize --version |head -n 1 |awk '{ print $(NF); }')" in
0.*) ;;
1.*) ;;
*) libtoolize_opt=-i;;
diff --git a/scripts/functions b/scripts/functions
index 44c9468..82bccab 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -743,8 +743,8 @@ CT_DoSaveState() {
CT_DoLog DEBUG " Saving environment and aliases"
# We must omit shell functions, and some specific bash variables
# that break when restoring the environment, later. We could do
- # all the processing in the gawk script, but a sed is easier...
- set |"${awk}" '
+ # all the processing in the awk script, but a sed is easier...
+ set |awk '
BEGIN { _p = 1; }
$0~/^[^ ]+ \(\)/ { _p = 0; }
_p == 1
diff --git a/scripts/saveSample.sh.in b/scripts/saveSample.sh.in
index b9bced4..6b3f205 100644
--- a/scripts/saveSample.sh.in
+++ b/scripts/saveSample.sh.in
@@ -78,8 +78,8 @@ fi
CT_DoAddFileToSample() {
source="$1"
dest="$2"
- inode_s=$(ls -i "${source}" |"${awk}" '{ print $1; }')
- inode_d=$(ls -i "${dest}" 2>/dev/null |"${awk}" '{ print $1; }' || true)
+ inode_s=$(ls -i "${source}" |awk '{ print $1; }')
+ inode_d=$(ls -i "${dest}" 2>/dev/null |awk '{ print $1; }' || true)
if [ "${inode_s}" != "${inode_d}" ]; then
cp "${source}" "${dest}"
fi