summaryrefslogtreecommitdiff
path: root/crypto
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 /crypto
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 'crypto')
-rw-r--r--crypto/external/bsd/netpgp/bin/netpgpverify/Makefile4
-rw-r--r--crypto/external/bsd/netpgp/lib/netpgp/Makefile4
-rw-r--r--crypto/external/bsd/netpgp/lib/verify/Makefile4
-rw-r--r--crypto/external/bsd/openssh/bin/ssh-agent/Makefile4
-rw-r--r--crypto/external/bsd/openssh/bin/ssh-keygen/Makefile4
-rw-r--r--crypto/external/bsd/openssh/bin/ssh/Makefile4
-rw-r--r--crypto/external/bsd/openssh/bin/sshd/Makefile6
-rw-r--r--crypto/external/bsd/openssh/lib/Makefile6
8 files changed, 18 insertions, 18 deletions
diff --git a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
index 22fa291fff9..c17cff042d1 100644
--- a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
+++ b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/08/27 08:58:31 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2023/06/03 09:09:01 lukem Exp $
PROG=netpgpverify
BINDIR= /usr/bin
@@ -36,7 +36,7 @@ EXTDIST=${.CURDIR}/../../dist
COPTS+= -Wno-error=implicit-fallthrough
.endif
-COPTS.libverify.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.libverify.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/crypto/external/bsd/netpgp/lib/netpgp/Makefile b/crypto/external/bsd/netpgp/lib/netpgp/Makefile
index 3541ceb1015..f30cb5f0f84 100644
--- a/crypto/external/bsd/netpgp/lib/netpgp/Makefile
+++ b/crypto/external/bsd/netpgp/lib/netpgp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/05/09 00:14:44 christos Exp $
+# $NetBSD: Makefile,v 1.6 2023/06/03 09:09:01 lukem Exp $
.include <bsd.own.mk>
@@ -26,7 +26,7 @@ LIBDPLIBS+= crypto ${OPENSSL}/lib/libcrypto
LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
-COPTS.crypto.c+= ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.crypto.c+= ${CC_WNO_STRINGOP_OVERFLOW}
COPTS.openssl_crypto.c+=-Wno-error=deprecated-declarations
COPTS.symmetric.c+=-Wno-error=deprecated-declarations
diff --git a/crypto/external/bsd/netpgp/lib/verify/Makefile b/crypto/external/bsd/netpgp/lib/verify/Makefile
index 5bd659dde80..18c5dc2d04c 100644
--- a/crypto/external/bsd/netpgp/lib/verify/Makefile
+++ b/crypto/external/bsd/netpgp/lib/verify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2022/08/27 08:58:32 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2023/06/03 09:09:01 lukem Exp $
LIB=netpgpverify
SRCS+=b64.c
@@ -28,7 +28,7 @@ INCSDIR=/usr/include/netpgp
.include <bsd.own.mk>
COPTS+= ${${ACTIVE_CC} == "gcc":? -Wno-implicit-fallthrough :}
-COPTS.libverify.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.libverify.c+= ${CC_WNO_FORMAT_TRUNCATION}
LINTFLAGS.bzlib.c+= -X 161 # constant in conditional context
LINTFLAGS.bzlib.c+= -X 220 # fallthrough on case statement
diff --git a/crypto/external/bsd/openssh/bin/ssh-agent/Makefile b/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
index 14107923f5e..c2eb0da7371 100644
--- a/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
+++ b/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2023/05/09 22:25:26 christos Exp $
+# $NetBSD: Makefile,v 1.7 2023/06/03 09:09:02 lukem Exp $
BINDIR=/usr/bin
PROG= ssh-agent
SRCS= ssh-agent.c ssh-pkcs11-client.c
-COPTS.ssh-agent.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.ssh-agent.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.ssh-pkcs11-client.c+= -Wno-error=deprecated-declarations
.include <bsd.prog.mk>
diff --git a/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile b/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
index 3b5160f298c..a6b3a210b9f 100644
--- a/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
+++ b/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2023/05/09 22:25:26 christos Exp $
+# $NetBSD: Makefile,v 1.10 2023/06/03 09:09:02 lukem Exp $
BINDIR= /usr/bin
@@ -7,7 +7,7 @@ SRCS= ssh-keygen.c moduli.c sshsig.c
COPTS.ssh-keygen.c+= -Wno-pointer-sign
-COPTS.ssh-keygen.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.ssh-keygen.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.ssh-keygen.c+= -Wno-error=deprecated-declarations
COPTS.moduli.c+= -Wno-error=deprecated-declarations
diff --git a/crypto/external/bsd/openssh/bin/ssh/Makefile b/crypto/external/bsd/openssh/bin/ssh/Makefile
index e04a5731427..6cde70a4f24 100644
--- a/crypto/external/bsd/openssh/bin/ssh/Makefile
+++ b/crypto/external/bsd/openssh/bin/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2022/10/05 22:39:36 christos Exp $
+# $NetBSD: Makefile,v 1.19 2023/06/03 09:09:02 lukem Exp $
.include <bsd.own.mk>
@@ -23,6 +23,6 @@ LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD}
DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
.endif
-COPTS.sshconnect.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.sshconnect.c+= ${CC_WNO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
diff --git a/crypto/external/bsd/openssh/bin/sshd/Makefile b/crypto/external/bsd/openssh/bin/sshd/Makefile
index 622d1912035..2ff8a0c08e4 100644
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2023/05/09 22:25:26 christos Exp $
+# $NetBSD: Makefile,v 1.27 2023/06/03 09:09:02 lukem Exp $
.include <bsd.own.mk>
@@ -71,8 +71,8 @@ LDADD+= -lblocklist
DPADD+= ${LIBBLOCKLIST}
.endif
-COPTS.sshlogin.c+= ${GCC_NO_STRINGOP_TRUNCATION}
-COPTS.ldapauth.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.sshlogin.c+= ${CC_WNO_STRINGOP_TRUNCATION}
+COPTS.ldapauth.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_STRINGOP_OVERFLOW}
COPTS.monitor.c+= -Wno-error=deprecated-declarations
COPTS.kexgexs.c+= -Wno-error=deprecated-declarations
diff --git a/crypto/external/bsd/openssh/lib/Makefile b/crypto/external/bsd/openssh/lib/Makefile
index edd83725ca1..068edcc856f 100644
--- a/crypto/external/bsd/openssh/lib/Makefile
+++ b/crypto/external/bsd/openssh/lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2023/05/09 02:08:31 christos Exp $
+# $NetBSD: Makefile,v 1.36 2023/06/03 09:09:02 lukem Exp $
.include <bsd.own.mk>
@@ -127,8 +127,8 @@ COPTS.poly1305.c+= -O0
COPTS.umac.c+= -O0
.endif
-COPTS.hostfile.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.sshkey.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.hostfile.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.sshkey.c+= ${CC_WNO_FORMAT_TRUNCATION}
COPTS.cipher.c+= -Wno-error=deprecated-declarations
COPTS.dh.c+= -Wno-error=deprecated-declarations
COPTS.kex.c+= -Wno-error=deprecated-declarations