Avoid using gawk, where generic awk is enough

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index ddd9179341b02ab02c902eccc0afb7b8131c4a02..f23545e5b8192aebb2e925113edb72dae7550855 100755 (executable)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -432,7 +432,7 @@ install_qa_check() {
                # Check for shared libraries lacking SONAMEs
                qa_var="QA_SONAME_${ARCH/-/_}"
                eval "[[ -n \${!qa_var} ]] && QA_SONAME=(\"\${${qa_var}[@]}\")"
-               f=$(scanelf -ByF '%S %p' "${ED}"{,usr/}lib*/lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${ED}:/:")
+               f=$(scanelf -ByF '%S %p' "${ED}"{,usr/}lib*/lib*.so* | awk '$2 == "" { print }' | sed -e "s:^[[:space:]]${ED}:/:")
                if [[ -n ${f} ]] ; then
                        echo "${f}" > "${T}"/scanelf-missing-SONAME.log
                        if [[ "${QA_STRICT_SONAME-unset}" == unset ]] ; then
@@ -466,7 +466,7 @@ install_qa_check() {
                # Check for shared libraries lacking NEEDED entries
                qa_var="QA_DT_NEEDED_${ARCH/-/_}"
                eval "[[ -n \${!qa_var} ]] && QA_DT_NEEDED=(\"\${${qa_var}[@]}\")"
-               f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*/lib*.so* | gawk '$2 == "" { print }' | sed -e "s:^[[:space:]]${ED}:/:")
+               f=$(scanelf -ByF '%n %p' "${ED}"{,usr/}lib*/lib*.so* | awk '$2 == "" { print }' | sed -e "s:^[[:space:]]${ED}:/:")
                if [[ -n ${f} ]] ; then
                        echo "${f}" > "${T}"/scanelf-missing-NEEDED.log
                        if [[ "${QA_STRICT_DT_NEEDED-unset}" == unset ]] ; then

diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py
index 282a045edade4a9263194d584463ddead9f7c1ee..5c0d821e09b94e279be913c77e50eb50141451dc 100644 (file)
--- a/pym/portage/tests/emerge/test_simple.py
+++ b/pym/portage/tests/emerge/test_simple.py
@@ -316,7 +316,7 @@ pkg_preinst() {
                # Override things that may be unavailable, or may have portability
                # issues when running tests in exotic environments.
                #   prepstrip - bug #447810 (bash read builtin EINTR problem)
-               true_symlinks = ["find", "gawk", "prepstrip", "sed", "scanelf"]
+               true_symlinks = ["find", "prepstrip", "sed", "scanelf"]
                true_binary = find_binary("true")
                self.assertEqual(true_binary is None, False,
                        "true command not found")