diff options
| author |   Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-04-20 21:10:03 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-04-20 21:10:03 (GMT) |
| commit | 1805f4e62d15259fdef1e363896b810db07b0a46 (patch) | |
| tree | 182e163dc9a8c56168f4f8be897dd1643ea03d5b /scripts | |
| parent | aaaca05f1e34610ee25618402b6faf9f6102c627 (diff) | |
There's no longer any reason to require GNU awk:
- the only part that required it (socks proxy settings) is gone,
- all remaining awk scripts are POSIXly correct (or should be).
-------- diffstat follows --------
/trunk/configure | 5 2 3 0 ++---
/trunk/Makefile.in | 2 0 2 0 --
/trunk/scripts/build/kernel/linux.sh | 2 1 1 0 +-
/trunk/scripts/build/internals.sh | 1 0 1 0 -
/trunk/scripts/build/mpfr.sh | 2 1 1 0 +-
/trunk/scripts/functions | 4 2 2 0 ++--
/trunk/scripts/saveSample.sh.in | 4 2 2 0 ++--
7 files changed, 8 insertions(+), 12 deletions(-)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/internals.sh | 1 | ||||
| -rw-r--r-- | scripts/build/kernel/linux.sh | 2 | ||||
| -rw-r--r-- | scripts/build/mpfr.sh | 2 | ||||
| -rw-r--r-- | scripts/functions | 4 | ||||
| -rw-r--r-- | scripts/saveSample.sh.in | 4 |
5 files changed, 6 insertions, 7 deletions
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 |