Mon Apr 20 13:04:10 2020 UTC ()
Don't let clang warn about comparing pointers with string literals.


(joerg)
diff -r1.21 -r1.22 src/external/bsd/nvi/usr.bin/nvi/Makefile
diff -r1.22 -r1.23 src/external/ibm-public/postfix/Makefile.inc
diff -r1.10 -r1.11 src/external/mit/xorg/bin/xkbcomp/Makefile
cvs diff -r1.21 -r1.22 src/external/bsd/nvi/usr.bin/nvi/Makefile (expand / switch to unified diff)

--- src/external/bsd/nvi/usr.bin/nvi/Makefile 2020/04/12 17:28:57 1.21
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile 2020/04/20 13:04:10 1.22
@@ -1,32 +1,33 @@ @@ -1,32 +1,33 @@
1# $NetBSD: Makefile,v 1.21 2020/04/12 17:28:57 martin Exp $ 1# $NetBSD: Makefile,v 1.22 2020/04/20 13:04:10 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5USE_WIDECHAR?=yes 5USE_WIDECHAR?=yes
6 6
7WARNS= 5 7WARNS= 5
8 8
9COPTS.exf.c+= -Wno-format-nonliteral 9COPTS.exf.c+= -Wno-format-nonliteral
10COPTS.msg.c+= -Wno-format-nonliteral 10COPTS.msg.c+= -Wno-format-nonliteral
11.if ${USE_WIDECHAR} == "yes" 11.if ${USE_WIDECHAR} == "yes"
12.if ${ACTIVE_CC} == "gcc" 12.if ${ACTIVE_CC} == "gcc"
13COPTS.regexec.c+= -Wno-old-style-definition 13COPTS.regexec.c+= -Wno-old-style-definition
14.endif 14.endif
15.else 15.else
16COPTS.v_increment.c+= -Wno-format-nonliteral 16COPTS.v_increment.c+= -Wno-format-nonliteral
17CWARNFLAGS.gcc+= -Wno-unused 17CWARNFLAGS.gcc+= -Wno-unused
18CWARNFLAGS.clang+= -Wno-unsequenced 18CWARNFLAGS.clang+= -Wno-unsequenced
19.endif 19.endif
 20CWARNFLAGS.clang+= -Wno-error=string-compare
20 21
21CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I. 22CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I.
22CPPFLAGS+=-DGTAGS -DIMCTRL 23CPPFLAGS+=-DGTAGS -DIMCTRL
23CPPFLAGS+=-DHAVE_OPENPTY -DHAVE_UTIL_H 24CPPFLAGS+=-DHAVE_OPENPTY -DHAVE_UTIL_H
24CPPFLAGS+=-DHAVE_SIGTIMEDWAIT  25CPPFLAGS+=-DHAVE_SIGTIMEDWAIT
25CPPFLAGS+=-DHAVE_MVWCHGAT 26CPPFLAGS+=-DHAVE_MVWCHGAT
26 27
27#DBG=-g 28#DBG=-g
28#CPPFLAGS+=-DLOGDEBUG -DTRACE 29#CPPFLAGS+=-DLOGDEBUG -DTRACE
29#CPPFLAGS+=-DDBDEBUG -DTRACE 30#CPPFLAGS+=-DDBDEBUG -DTRACE
30#CPPFLAGS+=-DQUEUEDEBUG 31#CPPFLAGS+=-DQUEUEDEBUG
31 32
32LDADD+= -lcurses -lterminfo -lutil 33LDADD+= -lcurses -lterminfo -lutil
cvs diff -r1.22 -r1.23 src/external/ibm-public/postfix/Makefile.inc (expand / switch to unified diff)

--- src/external/ibm-public/postfix/Makefile.inc 2020/04/04 15:45:45 1.22
+++ src/external/ibm-public/postfix/Makefile.inc 2020/04/20 13:04:10 1.23
@@ -1,19 +1,20 @@ @@ -1,19 +1,20 @@
1# $NetBSD: Makefile.inc,v 1.22 2020/04/04 15:45:45 christos Exp $ 1# $NetBSD: Makefile.inc,v 1.23 2020/04/20 13:04:10 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5USE_FORT?= yes # network client and server 5USE_FORT?= yes # network client and server
6CWARNFLAGS.clang+= -Wno-empty-body -Wno-format-extra-args -Wno-string-plus-int 6CWARNFLAGS.clang+= -Wno-empty-body -Wno-format-extra-args \
 7 -Wno-string-plus-int -Wno-string-compare
7WARNS?= 0 8WARNS?= 0
8 9
9PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist 10PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist
10 11
11CPPFLAGS+= -DNETBSD7 -DUSE_SASL_AUTH -DNO_EAI \ 12CPPFLAGS+= -DNETBSD7 -DUSE_SASL_AUTH -DNO_EAI \
12 -I${DIST} \ 13 -I${DIST} \
13 -I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \ 14 -I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \
14 -I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \ 15 -I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \
15 -I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \ 16 -I${PFIX_DISTDIR}/src/tls -I${PFIX_DISTDIR}/src/milter \
16 -I${PFIX_DISTDIR}/src/xsasl \ 17 -I${PFIX_DISTDIR}/src/xsasl \
17 ${${ACTIVE_CC} == "clang":?-Wno-comment:} 18 ${${ACTIVE_CC} == "clang":?-Wno-comment:}
18 19
19CPPFLAGS+= -DUSE_SASL_AUTH 20CPPFLAGS+= -DUSE_SASL_AUTH
cvs diff -r1.10 -r1.11 src/external/mit/xorg/bin/xkbcomp/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xkbcomp/Makefile 2015/07/20 23:50:23 1.10
+++ src/external/mit/xorg/bin/xkbcomp/Makefile 2020/04/20 13:04:10 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.10 2015/07/20 23:50:23 mrg Exp $ 1# $NetBSD: Makefile,v 1.11 2020/04/20 13:04:10 joerg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6PROG= xkbcomp 6PROG= xkbcomp
7SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \ 7SRCS= xkbcomp.c xkbscan.c expr.c vmod.c indicators.c misc.c \
8 keymap.c keycodes.c keytypes.c compat.c action.c alias.c \ 8 keymap.c keycodes.c keytypes.c compat.c action.c alias.c \
9 symbols.c geometry.c xkbpath.c listing.c \ 9 symbols.c geometry.c xkbpath.c listing.c \
10 xkbparse.y parseutils.c utils.c 10 xkbparse.y parseutils.c utils.c
11 11
12CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBROOTDIR}\" 12CPPFLAGS.xkbpath.c= -DDFLT_XKB_CONFIG_ROOT=\"${XKBROOTDIR}\"
13 13
14CPPFLAGS+= -I${X11SRCDIR.${PROG}} 14CPPFLAGS+= -I${X11SRCDIR.${PROG}}
@@ -18,19 +18,19 @@ COPTS.xkbscan.c+= -Wno-stack-protector @@ -18,19 +18,19 @@ COPTS.xkbscan.c+= -Wno-stack-protector
18 18
19FILESDIR=${XKBROOTDIR} 19FILESDIR=${XKBROOTDIR}
20FILES= README 20FILES= README
21 21
22SYMLINKS+= ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp 22SYMLINKS+= ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp
23SYMLINKS+= ${XKBDATADIR} ${XKBCOMPDIR} 23SYMLINKS+= ${XKBDATADIR} ${XKBCOMPDIR}
24 24
25LDADD+= -lxkbfile -lXext -lX11 25LDADD+= -lxkbfile -lXext -lX11
26DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11} 26DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
27 27
28.PATH: ${X11SRCDIR.${PROG}} 28.PATH: ${X11SRCDIR.${PROG}}
29.PATH: ${X11SRCDIR.${PROG}}/man 29.PATH: ${X11SRCDIR.${PROG}}/man
30 30
31CWARNFLAGS.clang+= -Wno-parentheses 31CWARNFLAGS.clang+= -Wno-parentheses -Wno-string-compare
32 32
33.include "../../xorg-pkg-ver.mk" 33.include "../../xorg-pkg-ver.mk"
34 34
35.include <bsd.x11.mk> 35.include <bsd.x11.mk>
36.include <bsd.prog.mk> 36.include <bsd.prog.mk>