[src/trunk]: src/external/mit/xorg/lib/libXaw Ignore pointer cast warnings fo...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7cca7aa783fd
branches:  trunk
changeset: 983593:7cca7aa783fd
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun May 30 02:20:09 2021 +0000

description:
Ignore pointer cast warnings for clang, too. Use -Wno-format more
selectively.

diffstat:

 external/mit/xorg/lib/libXaw/Makefile        |  4 +---
 external/mit/xorg/lib/libXaw/Makefile.common |  5 ++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r e904c698fa12 -r 7cca7aa783fd external/mit/xorg/lib/libXaw/Makefile
--- a/external/mit/xorg/lib/libXaw/Makefile     Sun May 30 01:56:44 2021 +0000
+++ b/external/mit/xorg/lib/libXaw/Makefile     Sun May 30 02:20:09 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2021/04/26 21:53:53 mrg Exp $
+#      $NetBSD: Makefile,v 1.17 2021/05/30 02:20:09 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -66,5 +66,3 @@
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
-
-CWARNFLAGS.clang+=     -Wno-format
diff -r e904c698fa12 -r 7cca7aa783fd external/mit/xorg/lib/libXaw/Makefile.common
--- a/external/mit/xorg/lib/libXaw/Makefile.common      Sun May 30 01:56:44 2021 +0000
+++ b/external/mit/xorg/lib/libXaw/Makefile.common      Sun May 30 02:20:09 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.common,v 1.2 2021/05/04 17:47:05 rillig Exp $
+#      $NetBSD: Makefile.common,v 1.3 2021/05/30 02:20:09 joerg Exp $
 
 CPPFLAGS+=     -DHAVE_WCHAR_H          \
                -DHAVE_WCTYPE_H         \
@@ -17,5 +17,8 @@
        Xext    ${.CURDIR}/../libXext \
        X11     ${.CURDIR}/../libX11/dynamic
 
+COPTS.Converters.c+=   ${${ACTIVE_CC} == "clang":? -Wno-format :}
 COPTS.Pixmap.c+=       ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
+COPTS.Pixmap.c+=       ${${ACTIVE_CC} == "clang":? -Wno-incompatible-pointer-types-discards-qualifiers :}
 COPTS.TextAction.c+=   ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
+COPTS.TextAction.c+=   ${${ACTIVE_CC} == "clang":? -Wno-incompatible-pointer-types-discards-qualifiers :}