[pkgsrc/trunk]: pkgsrc/ham/xlog ham/xlog: Rototill approach to non-portable w...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/304a68546eec
branches:  trunk
changeset: 446137:304a68546eec
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Feb 04 20:02:14 2021 +0000

description:
ham/xlog: Rototill approach to non-portable warnings

Mostly, this is adapting the warning flags removed from the build and
those added to clang vs gcc.

Hoist removal of -Wno-stringop-truncation to always happen, because it
was separately on for clang and gcc, and it seems likely it would be
unknown on some other compiler.

diffstat:

 ham/xlog/Makefile |  22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diffs (39 lines):

diff -r b2e958c29faf -r 304a68546eec ham/xlog/Makefile
--- a/ham/xlog/Makefile Thu Feb 04 19:21:48 2021 +0000
+++ b/ham/xlog/Makefile Thu Feb 04 20:02:14 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2021/02/04 19:21:48 gdt Exp $
+# $NetBSD: Makefile,v 1.94 2021/02/04 20:02:14 gdt Exp $
 #
 
 DISTNAME=      xlog-2.0.20
@@ -16,16 +16,22 @@
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake pkg-config
 
+# Fails with gcc 5.5.0 (netbsd-8) and clang.
+BUILDLINK_TRANSFORM+=  rm:-Wno-stringop-truncation
+
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 BUILDLINK_TRANSFORM+=  rm:-Wno-unused-but-set-variable
-_WRAP_EXTRA_ARGS.CC+=  -Wno-error=parentheses-equality -Wno-error=tautological-compare -Wno-unknown-warning-option -Wno-deprecated-declarations -Wno-uninitialized
-CWRAPPERS_APPEND.cc+=  -Wno-error=parentheses-equality -Wno-error=tautological-compare -Wno-unknown-warning-option -Wno-deprecated-declarations -Wno-uninitialized
-.endif
-
-# Problematic with 5.5.0 on netbsd-8.
-.if !empty(PKGSRC_COMPILER:Mgcc)
-BUILDLINK_TRANSFORM+=  rm:-Wno-stringop-truncation
+# xlog has things like: #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+# https://savannah.nongnu.org/bugs/index.php?60003
+_WRAP_EXTRA_ARGS.CC+=  -Wno-unknown-warning-option
+CWRAPPERS_APPEND.cc+=  -Wno-unknown-warning-option
+# xlog has code that triggers clang warnings
+# https://savannah.nongnu.org/bugs/index.php?60004
+_WRAP_EXTRA_ARGS.CC+=  -Wno-error=parentheses-equality
+CWRAPPERS_APPEND.cc+=  -Wno-error=parentheses-equality
+_WRAP_EXTRA_ARGS.CC+=  -Wno-uninitialized
+CWRAPPERS_APPEND.cc+=  -Wno-uninitialized
 .endif
 
 .include "../../databases/shared-mime-info/buildlink3.mk"