commit:     3d5e6efaae8c6d326215bad78abaa6c2c8eb8f6c
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Thu May 22 18:14:54 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 30 07:37:29 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=3d5e6efa

90gcc-warnings: remove dead code

In the event that the dead code should be deemed useful in the future,
it may be recovered from git. As it stands, its continued presence only
makes it harder to re-factor the code.

Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/install-qa-check.d/90gcc-warnings | 50 +++++++++--------------------------
 1 file changed, 12 insertions(+), 38 deletions(-)

diff --git a/bin/install-qa-check.d/90gcc-warnings 
b/bin/install-qa-check.d/90gcc-warnings
index 42166a7bf4..ea51f19d32 100644
--- a/bin/install-qa-check.d/90gcc-warnings
+++ b/bin/install-qa-check.d/90gcc-warnings
@@ -3,7 +3,7 @@
 # TODO: add -Wformat-security
 
 gcc_warn_check() {
-        local abort always_overflow f gentoo_bug grep_cmd implicit_func_decl 
joined_msgs reset_debug
+        local abort f grep_cmd joined_msgs reset_debug
         local -a msgs
 
        # Evaluate misc gcc warnings
@@ -165,49 +165,23 @@ gcc_warn_check() {
        if [[ -n ${f} ]] ; then
                abort="yes"
 
-               # for now, don't make this fatal (see bug #337031)
-               #if [[ ${f} == *'will always overflow destination buffer'* ]]; 
then
-               #       always_overflow=yes
-               #fi
-
-               # Disabled for now because too many failures. bug #870412.
-               #if [[ ${f} == *'[-Wimplicit-function-declaration]'* ]] ; then
-               #       implicit_func_decl=yes
-               #fi
-
-               if [[ ${always_overflow} = yes || ${implicit_func_decl} = yes 
]] ; then
-                       eerror
-                       eerror "QA Notice: Package triggers severe warnings 
which indicate that it"
-                       eerror "           may exhibit random runtime failures."
-                       eerror
-                       eerror "${f}"
-                       eerror
-                       eerror " Please file a bug about this at 
https://bugs.gentoo.org/";
-                       eerror " with the maintainer of the package."
-                       eerror
-               else
-                       __vecho -ne '\n'
-                       eqawarn "QA Notice: Package triggers severe warnings 
which indicate that it"
-                       eqawarn "           may exhibit random runtime 
failures."
-                       eqawarn "${f}"
-                       __vecho -ne '\n'
-               fi
+               __vecho -ne '\n'
+               eqawarn "QA Notice: Package triggers severe warnings which 
indicate that it"
+               eqawarn "           may exhibit random runtime failures."
+               eqawarn "${f}"
+               __vecho -ne '\n'
        fi
 
        [[ ${reset_debug} = 1 ]] && set -x
 
        if [[ ${abort} == "yes" ]] ; then
-               if [[ ${gentoo_bug} = yes || ${always_overflow} = yes || 
${implicit_func_decl} = yes ]] ; then
+               echo "Please do not file a Gentoo bug and instead" \
+               "report the above QA issues directly to the upstream" \
+               "developers of this software." | fmt -w 70 | \
+               while read -r line ; do eqawarn "${line}" ; done
+               eqawarn "Homepage: ${HOMEPAGE}"
+               has stricter ${FEATURES} && \
                        die "install aborted due to severe warnings shown above"
-               else
-                       echo "Please do not file a Gentoo bug and instead" \
-                       "report the above QA issues directly to the upstream" \
-                       "developers of this software." | fmt -w 70 | \
-                       while read -r line ; do eqawarn "${line}" ; done
-                       eqawarn "Homepage: ${HOMEPAGE}"
-                       has stricter ${FEATURES} && \
-                               die "install aborted due to severe warnings 
shown above"
-               fi
        fi
 }
 

Reply via email to