Sun May 30 02:20:09 2021 UTC ()
Ignore pointer cast warnings for clang, too. Use -Wno-format more
selectively.


(joerg)
diff -r1.16 -r1.17 src/external/mit/xorg/lib/libXaw/Makefile
diff -r1.2 -r1.3 src/external/mit/xorg/lib/libXaw/Makefile.common
cvs diff -r1.16 -r1.17 src/external/mit/xorg/lib/libXaw/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libXaw/Makefile 2021/04/26 21:53:53 1.16
+++ src/external/mit/xorg/lib/libXaw/Makefile 2021/05/30 02:20:09 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.16 2021/04/26 21:53:53 mrg Exp $ 1# $NetBSD: Makefile,v 1.17 2021/05/30 02:20:09 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= Xaw7 5LIB= Xaw7
6LIBOLD= Xaw 6LIBOLD= Xaw
7 7
8.if ${MKSTATICLIB} != "no" 8.if ${MKSTATICLIB} != "no"
9SYMLINKS= lib${LIB}.a ${X11USRLIBDIR}/lib${LIBOLD}.a 9SYMLINKS= lib${LIB}.a ${X11USRLIBDIR}/lib${LIBOLD}.a
10.endif 10.endif
11 11
12.if ${MKPROFILE} != "no" 12.if ${MKPROFILE} != "no"
13SYMLINKS+= lib${LIB}_p.a ${X11USRLIBDIR}/lib${LIBOLD}_p.a 13SYMLINKS+= lib${LIB}_p.a ${X11USRLIBDIR}/lib${LIBOLD}_p.a
14.endif 14.endif
@@ -56,15 +56,13 @@ CPPFLAGS+= -DXAW7 \ @@ -56,15 +56,13 @@ CPPFLAGS+= -DXAW7 \
56 -I${DESTDIR}${X11INCDIR}/X11/extensions 56 -I${DESTDIR}${X11INCDIR}/X11/extensions
57 57
58LIBDPLIBS+=\ 58LIBDPLIBS+=\
59 Xpm ${.CURDIR}/../libXpm 59 Xpm ${.CURDIR}/../libXpm
60 60
61PKGCONFIG= xaw7 61PKGCONFIG= xaw7
62PKGDIST= ${LIBOLD} 62PKGDIST= ${LIBOLD}
63 63
64X11EXTRAMANTRANSFORMS+= \ 64X11EXTRAMANTRANSFORMS+= \
65 __docdir__ ${X11LIBDIR}/doc 65 __docdir__ ${X11LIBDIR}/doc
66 66
67.include <bsd.x11.mk> 67.include <bsd.x11.mk>
68.include <bsd.lib.mk> 68.include <bsd.lib.mk>
69 
70CWARNFLAGS.clang+= -Wno-format 
cvs diff -r1.2 -r1.3 src/external/mit/xorg/lib/libXaw/Makefile.common (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libXaw/Makefile.common 2021/05/04 17:47:05 1.2
+++ src/external/mit/xorg/lib/libXaw/Makefile.common 2021/05/30 02:20:09 1.3
@@ -1,21 +1,24 @@ @@ -1,21 +1,24 @@
1# $NetBSD: Makefile.common,v 1.2 2021/05/04 17:47:05 rillig Exp $ 1# $NetBSD: Makefile.common,v 1.3 2021/05/30 02:20:09 joerg Exp $
2 2
3CPPFLAGS+= -DHAVE_WCHAR_H \ 3CPPFLAGS+= -DHAVE_WCHAR_H \
4 -DHAVE_WCTYPE_H \ 4 -DHAVE_WCTYPE_H \
5 -DNO_WIDEC_H \ 5 -DNO_WIDEC_H \
6 -DHAVE_ISWALNUM \ 6 -DHAVE_ISWALNUM \
7 -DHAVE_GETPAGESIZE \ 7 -DHAVE_GETPAGESIZE \
8 -DHAVE_UNISTD_H \ 8 -DHAVE_UNISTD_H \
9 -D_CONST_X_STRING=1 \ 9 -D_CONST_X_STRING=1 \
10 -DPROJECT_ROOT=\"${X11ROOTDIR}\" 10 -DPROJECT_ROOT=\"${X11ROOTDIR}\"
11 11
12LIBDPLIBS=\ 12LIBDPLIBS=\
13 Xmu ${.CURDIR}/../libXmu \ 13 Xmu ${.CURDIR}/../libXmu \
14 Xt ${.CURDIR}/../libXt \ 14 Xt ${.CURDIR}/../libXt \
15 SM ${.CURDIR}/../libSM \ 15 SM ${.CURDIR}/../libSM \
16 ICE ${.CURDIR}/../libICE \ 16 ICE ${.CURDIR}/../libICE \
17 Xext ${.CURDIR}/../libXext \ 17 Xext ${.CURDIR}/../libXext \
18 X11 ${.CURDIR}/../libX11/dynamic 18 X11 ${.CURDIR}/../libX11/dynamic
19 19
 20COPTS.Converters.c+= ${${ACTIVE_CC} == "clang":? -Wno-format :}
20COPTS.Pixmap.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :} 21COPTS.Pixmap.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
 22COPTS.Pixmap.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-pointer-types-discards-qualifiers :}
21COPTS.TextAction.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :} 23COPTS.TextAction.c+= ${${ACTIVE_CC} == "gcc":? -Wno-discarded-qualifiers :}
 24COPTS.TextAction.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-pointer-types-discards-qualifiers :}