summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2019-02-04 04:05:15 +0000
committermrg <mrg@NetBSD.org>2019-02-04 04:05:15 +0000
commit8030a609aced35446315af3328befdd6b4a363de (patch)
treee07f25927320f85c8f8a1a72162c958eb7a0a8f5 /crypto
parentd9f13cd32ee68a6c2a83df0d0b039b2912c7efee (diff)
- use -Wno-error=implicit-fallthrough with GCC7.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/external/bsd/netpgp/bin/netpgpverify/Makefile8
-rw-r--r--crypto/external/bsd/netpgp/lib/verify/Makefile8
-rw-r--r--crypto/external/bsd/openssh/bin/sftp/Makefile8
3 files changed, 21 insertions, 3 deletions
diff --git a/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile b/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
index 148d0ffd23b..c5081946554 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.15 2017/04/17 19:50:27 agc Exp $
+# $NetBSD: Makefile,v 1.16 2019/02/04 04:05:15 mrg Exp $
PROG=netpgpverify
BINDIR= /usr/bin
@@ -26,6 +26,12 @@ EXTDIST=${.CURDIR}/../../dist
.PATH: ${EXTDIST}/src/netpgpverify
+.include <bsd.own.mk>
+
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS+= -Wno-error=implicit-fallthrough
+.endif
+
.include <bsd.prog.mk>
t tst: ${PROG}
diff --git a/crypto/external/bsd/netpgp/lib/verify/Makefile b/crypto/external/bsd/netpgp/lib/verify/Makefile
index e390f9cc74d..59012e8fa41 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.9 2017/04/17 19:50:28 agc Exp $
+# $NetBSD: Makefile,v 1.10 2019/02/04 04:05:15 mrg Exp $
LIB=netpgpverify
SRCS+=b64.c
@@ -25,4 +25,10 @@ EXTDIST=${.CURDIR}/../../dist
INCS=verify.h
INCSDIR=/usr/include/netpgp
+.include <bsd.own.mk>
+
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS+= -Wno-error=implicit-fallthrough
+.endif
+
.include <bsd.lib.mk>
diff --git a/crypto/external/bsd/openssh/bin/sftp/Makefile b/crypto/external/bsd/openssh/bin/sftp/Makefile
index b502c1bcbcc..5371f0b619e 100644
--- a/crypto/external/bsd/openssh/bin/sftp/Makefile
+++ b/crypto/external/bsd/openssh/bin/sftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/08/10 12:20:11 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2019/02/04 04:05:15 mrg Exp $
BINDIR= /usr/bin
@@ -12,4 +12,10 @@ DPADD+= ${LIBEDIT} ${LIBTERMINFO}
COPTS.sftp.c+= -Wno-pointer-sign
COPTS.sftp-client.c+= -Wno-pointer-sign
+.include <bsd.own.mk>
+
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 7 && ${ACTIVE_CC} == "gcc"
+COPTS.sftp.c+= -Wno-error=implicit-fallthrough
+.endif
+
.include <bsd.prog.mk>