summaryrefslogtreecommitdiff
path: root/ham
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2021-02-16 20:22:52 +0000
committergdt <gdt@pkgsrc.org>2021-02-16 20:22:52 +0000
commit2c5f40cf06725d3b7627d8df3bbf33117cf2c52c (patch)
tree78e61e99134e0129bab922bc8e00b10de3b24242 /ham
parentb1f4f14feb570ec38234076a87562fc850c1f326 (diff)
downloadpkgsrc-2c5f40cf06725d3b7627d8df3bbf33117cf2c52c.tar.gz
ham/xlog: Improve workarounds for upstream portability issues
Diffstat (limited to 'ham')
-rw-r--r--ham/xlog/Makefile24
1 files changed, 13 insertions, 11 deletions
diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index dcafa61445e..1958f81c678 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2021/02/16 20:10:22 gdt Exp $
+# $NetBSD: Makefile,v 1.98 2021/02/16 20:22:52 gdt Exp $
#
DISTNAME= xlog-2.0.20
@@ -21,24 +21,26 @@ USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake pkg-config
.include "../../mk/compiler.mk"
+
+# Fails with gcc 5.5.0 (netbsd-8), and presumably earlier.
+# OK with gcc 7.4.0.
+# Fails with clang.
+.if !empty(CC_VERSION:Mgcc-[45].*) || !empty(PKGSRC_COMPILER:Mclang)
+BUILDLINK_TRANSFORM+= rm:-Wno-stringop-truncation
+.endif
+
.if !empty(PKGSRC_COMPILER:Mclang)
BUILDLINK_TRANSFORM+= rm:-Wno-unused-but-set-variable
# 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
+_WRAP_EXTRA_ARGS.CC+= -Wno-error=unknown-warning-option
+CWRAPPERS_APPEND.cc+= -Wno-error=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
-
-# Fails with gcc 5.5.0 (netbsd-8), and presumably earlier.
-# OK with gcc 7.4.0, and OK with at least recent clang.
-.if !empty(CC_VERSION:Mgcc-[45].*)
-BUILDLINK_TRANSFORM+= rm:-Wno-stringop-truncation
+_WRAP_EXTRA_ARGS.CC+= -Wno-error=uninitialized
+CWRAPPERS_APPEND.cc+= -Wno-error=uninitialized
.endif
.include "../../databases/shared-mime-info/buildlink3.mk"