Module Name: src
Committed By: joerg
Date: Sun May 30 02:20:09 UTC 2021
Modified Files:
src/external/mit/xorg/lib/libXaw: Makefile Makefile.common
Log Message:
Ignore pointer cast warnings for clang, too. Use -Wno-format more
selectively.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXaw/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.16 src/external/mit/xorg/lib/libXaw/Makefile:1.17
--- src/external/mit/xorg/lib/libXaw/Makefile:1.16 Mon Apr 26 21:53:53 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile Sun May 30 02:20:09 2021
@@ -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 @@ X11EXTRAMANTRANSFORMS+= \
.include <bsd.x11.mk>
.include <bsd.lib.mk>
-
-CWARNFLAGS.clang+= -Wno-format
Index: src/external/mit/xorg/lib/libXaw/Makefile.common
diff -u src/external/mit/xorg/lib/libXaw/Makefile.common:1.2 src/external/mit/xorg/lib/libXaw/Makefile.common:1.3
--- src/external/mit/xorg/lib/libXaw/Makefile.common:1.2 Tue May 4 17:47:05 2021
+++ src/external/mit/xorg/lib/libXaw/Makefile.common Sun May 30 02:20:09 2021
@@ -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 @@ LIBDPLIBS=\
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 :}
