summaryrefslogtreecommitdiff
path: root/external/mit
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 09:09:01 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 09:09:01 +0000
commitff6601a6cc5f10bccaf009e4e2b72c75774d7a4d (patch)
tree87fe4eb9bda81296a5ed95f9cf55e1a2bf1ecd9a /external/mit
parentabaa8cb87058c08ad0688c849a28f4e007c07bbb (diff)
bsd.own.mk: rename GCC_NO_* to CC_WNO_*
Rename compiler-warning-disable variables from GCC_NO_warning to CC_WNO_warning where warning is the full warning name as used by the compiler. GCC_NO_IMPLICIT_FALLTHRU is CC_WNO_IMPLICIT_FALLTHROUGH Using the convention CC_compilerflag, where compilerflag is based on the full compiler flag name.
Diffstat (limited to 'external/mit')
-rw-r--r--external/mit/lua/lib/liblua/Makefile4
-rw-r--r--external/mit/xorg/bin/xauth/Makefile4
-rw-r--r--external/mit/xorg/bin/xconsole/Makefile4
-rw-r--r--external/mit/xorg/bin/xmh/Makefile4
-rw-r--r--external/mit/xorg/lib/libX11/Makefile.ximcp4
-rw-r--r--external/mit/xorg/lib/libX11/Makefile.xlibi18n4
-rw-r--r--external/mit/xorg/lib/libXvMCW/Makefile4
-rw-r--r--external/mit/xorg/lib/libxkbfile/Makefile4
-rw-r--r--external/mit/xorg/server/drivers/xf86-video-sis/Makefile4
9 files changed, 18 insertions, 18 deletions
diff --git a/external/mit/lua/lib/liblua/Makefile b/external/mit/lua/lib/liblua/Makefile
index 33658d51af7..35c481e6b14 100644
--- a/external/mit/lua/lib/liblua/Makefile
+++ b/external/mit/lua/lib/liblua/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/04/16 20:46:17 nikita Exp $
+# $NetBSD: Makefile,v 1.13 2023/06/03 09:09:07 lukem Exp $
LIB= lua
LUA_CORE= lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c \
@@ -16,7 +16,7 @@ INCSDIR= /usr/include
CPPFLAGS+= -DLUA_USE_POSIX -DLUA_USE_DLOPEN
CWARNFLAGS.clang+= -Wno-empty-body -Wno-error=string-plus-int
-COPTS.lstring.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.lstring.c+= ${CC_WNO_STRINGOP_OVERFLOW}
LINTFLAGS+= -X 141 # integer overflow detected, op '<<'
LINTFLAGS+= -X 247 # pointer cast from 'pointer to struct
# GCObject' to 'pointer to union GCUnion' may
diff --git a/external/mit/xorg/bin/xauth/Makefile b/external/mit/xorg/bin/xauth/Makefile
index 97f88bc4c23..0adba9f33a3 100644
--- a/external/mit/xorg/bin/xauth/Makefile
+++ b/external/mit/xorg/bin/xauth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/10/28 09:43:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 09:09:07 lukem Exp $
.include <bsd.own.mk>
@@ -16,7 +16,7 @@ CPPFLAGS+= -DIPv6
.endif
CWARNFLAGS.clang= -Wno-empty-body
-COPTS.parsedpy.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.parsedpy.c+= ${CC_WNO_STRINGOP_OVERFLOW}
LDADD+= -lXau -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXAU} ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
diff --git a/external/mit/xorg/bin/xconsole/Makefile b/external/mit/xorg/bin/xconsole/Makefile
index 0ab9343e47e..4b4f5a2f407 100644
--- a/external/mit/xorg/bin/xconsole/Makefile
+++ b/external/mit/xorg/bin/xconsole/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:07 lukem Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@ DPADD+= ${LIBUTIL} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
CPPFLAGS+=-DHAS_OPENPTY -DHAVE_UTIL_H
-COPTS.xconsole.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.xconsole.c+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.x11.mk>
.include <bsd.prog.mk>
diff --git a/external/mit/xorg/bin/xmh/Makefile b/external/mit/xorg/bin/xmh/Makefile
index a8a2bedb109..55dccbb83ce 100644
--- a/external/mit/xorg/bin/xmh/Makefile
+++ b/external/mit/xorg/bin/xmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2023/06/03 09:09:07 lukem Exp $
.include <bsd.own.mk>
@@ -23,7 +23,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
CWARNFLAGS.clang+= -Wno-format
-COPTS+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS+= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.x11.mk>
.include <bsd.prog.mk>
diff --git a/external/mit/xorg/lib/libX11/Makefile.ximcp b/external/mit/xorg/lib/libX11/Makefile.ximcp
index e36399191be..23b17cbfbc4 100644
--- a/external/mit/xorg/lib/libX11/Makefile.ximcp
+++ b/external/mit/xorg/lib/libX11/Makefile.ximcp
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ximcp,v 1.5 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile.ximcp,v 1.6 2023/06/03 09:09:07 lukem Exp $
.PATH: ${X11SRCDIR.X11}/modules/im/ximcp
SRCS.ximcp= \
@@ -45,4 +45,4 @@ COPTS.imTrans.c= -Wno-error
COPTS.imLcLkup.c= -Wno-stack-protector
COPTS.imInsClbk.c= -Wno-unused-value
-COPTS.imDefIm.c= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.imDefIm.c= ${CC_WNO_STRINGOP_OVERFLOW}
diff --git a/external/mit/xorg/lib/libX11/Makefile.xlibi18n b/external/mit/xorg/lib/libX11/Makefile.xlibi18n
index 22f374d04ef..a366508e0cf 100644
--- a/external/mit/xorg/lib/libX11/Makefile.xlibi18n
+++ b/external/mit/xorg/lib/libX11/Makefile.xlibi18n
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xlibi18n,v 1.3 2019/10/13 07:28:08 mrg Exp $
+# $NetBSD: Makefile.xlibi18n,v 1.4 2023/06/03 09:09:07 lukem Exp $
.PATH: ${X11SRCDIR.X11}/modules/lc/gen
SRCS.xlibi18n= lcGenConv.c
@@ -11,4 +11,4 @@ CPPFLAGS+= \
${XLOCALE.DEFINES} \
-DHASXDMAUTH
-COPTS.lcGenConv.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.lcGenConv.c+= ${CC_WNO_STRINGOP_OVERFLOW}
diff --git a/external/mit/xorg/lib/libXvMCW/Makefile b/external/mit/xorg/lib/libXvMCW/Makefile
index 1564532786a..8b8fdb3b0b2 100644
--- a/external/mit/xorg/lib/libXvMCW/Makefile
+++ b/external/mit/xorg/lib/libXvMCW/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/02/23 09:24:12 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:08 lukem Exp $
.include <bsd.own.mk>
@@ -17,7 +17,7 @@ CPPFLAGS+= -I${X11SRCDIR.XvMC}/include
LIBDPLIBS= Xext ${.CURDIR}/../libXext \
X11 ${.CURDIR}/../libX11/dynamic
-COPTS.XvMCWrapper.c= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.XvMCWrapper.c= ${CC_WNO_STRINGOP_OVERFLOW}
# XXX
#PKGDIST= xvmc-wrapper
diff --git a/external/mit/xorg/lib/libxkbfile/Makefile b/external/mit/xorg/lib/libxkbfile/Makefile
index e2a1ee190b3..affc6e3a6bd 100644
--- a/external/mit/xorg/lib/libxkbfile/Makefile
+++ b/external/mit/xorg/lib/libxkbfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/10/29 21:06:15 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 09:09:08 lukem Exp $
.include <bsd.own.mk>
@@ -20,7 +20,7 @@ LIBDPLIBS= X11 ${.CURDIR}/../libX11/dynamic
PKGCONFIG= xkbfile
-COPTS.xkbatom.c= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.xkbatom.c= ${CC_WNO_STRINGOP_OVERFLOW}
.include <bsd.x11.mk>
.include <bsd.lib.mk>
diff --git a/external/mit/xorg/server/drivers/xf86-video-sis/Makefile b/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
index 9d01f9cf506..47283484fb4 100644
--- a/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
+++ b/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/10/13 07:28:09 mrg Exp $
+# $NetBSD: Makefile,v 1.19 2023/06/03 09:09:08 lukem Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -24,7 +24,7 @@ CWARNFLAGS.clang+= -Wno-parentheses
# XXX
COPTS.sis_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
-COPTS.sis_utility.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :} ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.sis_utility.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :} ${CC_WNO_STRINGOP_OVERFLOW}
COPTS.initextx.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.sis_driver.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
COPTS.sis_utility.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}