s/QA_DT_SWITCHES/QA_CFLAGS_IGNORED/

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index b6bd8ed36ffc374ceb4bafce3519a2c6bccf1995..4a1a2235b1e5e4edec6d6e70aed30fffa50792a0 100755 (executable)
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -311,20 +311,20 @@ install_qa_check() {
                # Check for files built without respecting CFLAGS
                if [[ "${CFLAGS}" == *-frecord-gcc-switches* ]] && \
                        ! has binchecks ${RESTRICT} ; then
-                       qa_var="QA_DT_SWITCHES_${ARCH/-/_}"
-                       eval "[[ -n \${!qa_var} ]] && QA_DT_SWITCHES=(\"\${${qa_var}[@]}\")"
+                       qa_var="QA_CFLAGS_IGNORED_${ARCH/-/_}"
+                       eval "[[ -n \${!qa_var} ]] && QA_CFLAGS_IGNORED=(\"\${${qa_var}[@]}\")"
                        f=$(scanelf -qyRF '%k %p' -k \!.GCC.command.line "${ED}" | sed -e "s:\!.GCC.command.line ::")
                        if [[ -n ${f} ]] ; then
                                echo "${f}" > "${T}"/scanelf-ignored-CFLAGS.log
                                if [ "${QA_STRICT_DT_SWITCHES-unset}" == unset ] ; then
-                                       if [[ ${#QA_DT_SWITCHES[@]} -gt 1 ]] ; then
-                                               for x in "${QA_DT_SWITCHES[@]}" ; do
+                                       if [[ ${#QA_CFLAGS_IGNORED[@]} -gt 1 ]] ; then
+                                               for x in "${QA_CFLAGS_IGNORED[@]}" ; do
                                                        sed -e "s#^${x#/}\$##" -i "${T}"/scanelf-ignored-CFLAGS.log
                                                done
                                        else
                                                local shopts=$-
                                                set -o noglob
-                                               for x in ${QA_DT_SWITCHES} ; do
+                                               for x in ${QA_CFLAGS_IGNORED} ; do
                                                        sed -e "s#^${x#/}\$##" -i "${T}"/scanelf-ignored-CFLAGS.log
                                                done
                                                set +o noglob

diff --git a/man/ebuild.5 b/man/ebuild.5
index 1216ac171ef84a98ef446c9e17e1d1c1e0c571c2..a9a26a72d4c6d1d4fa6550822d542d9f7f66b881 100644 (file)
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -602,7 +602,7 @@ This should contain a list of file paths, relative to the image directory, of
 files that contain writable and executable segments.  These are rare.
 The paths may contain fnmatch patterns.
 .TP
-\fBQA_DT_SWITCHES\fR
+\fBQA_CFLAGS_IGNORED\fR
 This should contain a list of file paths, relative to the image directory, of
 files that do not contain .GCC.command.line sections. The paths may contain
 regular expressions with escape\-quoted special characters.

diff --git a/man/make.conf.5 b/man/make.conf.5
index f9d69b71bf1eb1f7272f65c23b65ce2bdd65dc04..86b4d4bae3d26458b3382754b112bac4a53944f7 100644 (file)
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -815,7 +815,7 @@ Set this to cause portage to ignore any \fIQA_TEXTREL\fR override
 settings from ebuilds.  See also \fBebuild\fR(5).
 .TP
 \fBQA_STRICT_DT_SWITCHES = \fI"set"\fR
-Set this to cause portage to ignore any \fIQA_DT_SWITCHES\fR override
+Set this to cause portage to ignore any \fIQA_CFLAGS_IGNORED\fR override
 settings from ebuilds.  See also \fBebuild\fR(5).
 .TP
 \fBQA_STRICT_DT_HASH = \fI"set"\fR