diff options
| author | riastradh <riastradh@NetBSD.org> | 2023-05-25 19:12:06 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2023-05-25 19:12:06 +0000 |
| commit | f180ddf8aa4a0e464b88ff3de4745b7686c7f119 (patch) | |
| tree | 15ceba386ac862b4dd4978eb012c20186ac39114 /crypto | |
| parent | a2c126e1eeb7bb5d5b6d9ecb05e227421df88dfb (diff) | |
openssl: Consolidate new CWARNFLAGS.clang stuff in Makefile.openssl.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Makefile.openssl | 6 | ||||
| -rw-r--r-- | crypto/external/bsd/openssl/lib/libapps/Makefile | 6 | ||||
| -rw-r--r-- | crypto/external/bsd/openssl/lib/libcrypto/Makefile | 6 | ||||
| -rw-r--r-- | crypto/external/bsd/openssl/lib/libssl/Makefile | 6 |
4 files changed, 8 insertions, 16 deletions
diff --git a/crypto/Makefile.openssl b/crypto/Makefile.openssl index 3ff6868eda0..3a3abcc1c9a 100644 --- a/crypto/Makefile.openssl +++ b/crypto/Makefile.openssl @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.openssl,v 1.16 2023/05/23 12:05:10 christos Exp $ +# $NetBSD: Makefile.openssl,v 1.17 2023/05/25 19:12:06 riastradh Exp $ .ifndef _MAKEFILE_OPENSSL_INCLUDED _MAKEFILE_OPENSSL_INCLUDED=1 @@ -14,6 +14,10 @@ COPTS+= -Wno-error=shadow CWARNFLAGS.gcc+= -Wno-error=discarded-qualifiers CWARNFLAGS.clang+= -Wno-error=ignored-qualifiers +# OpenSSL extensively uses string literals as char *, which clang +# (reasonably if not exactly rightly) objects to. +CWARNFLAGS.clang+= -Wno-error=incompatible-pointer-types-discards-qualifiers + # XXX: re-examine the below CWARNFLAGS.clang+= -Wno-empty-body -Wno-unused-value -Wno-parentheses CWARNFLAGS.clang+= -Wno-implicit-int-float-conversion diff --git a/crypto/external/bsd/openssl/lib/libapps/Makefile b/crypto/external/bsd/openssl/lib/libapps/Makefile index d3db3d550fe..93ce14a1f93 100644 --- a/crypto/external/bsd/openssl/lib/libapps/Makefile +++ b/crypto/external/bsd/openssl/lib/libapps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2023/05/25 16:05:27 riastradh Exp $ +# $NetBSD: Makefile,v 1.6 2023/05/25 19:12:06 riastradh Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -33,10 +33,6 @@ CPPFLAGS+= -I${OPENSSLSRC}/../include CPPFLAGS+= -I${OPENSSLSRC}/apps/lib CPPFLAGS+= -I${OPENSSLSRC}/apps/include -# OpenSSL extensively uses string literals as char *, which clang -# (reasonably if not exactly rightly) objects to. -CWARNFLAGS.clang+=-Wno-error=incompatible-pointer-types-discards-qualifiers - CRYPTODIST= ${NETBSDSRCDIR}/crypto OPENSSLINC= ${OPENSSLSRC}/include/openssl diff --git a/crypto/external/bsd/openssl/lib/libcrypto/Makefile b/crypto/external/bsd/openssl/lib/libcrypto/Makefile index cd40470727d..0a6390e24b3 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/Makefile +++ b/crypto/external/bsd/openssl/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2023/05/25 16:05:28 riastradh Exp $ +# $NetBSD: Makefile,v 1.32 2023/05/25 19:12:06 riastradh Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -31,10 +31,6 @@ CPPFLAGS+= -I${OPENSSLSRC}/crypto/asn1 -I${OPENSSLSRC}/crypto/evp CPPFLAGS+= -I${OPENSSLSRC}/crypto/modes CPPFLAGS+= -I${OPENSSLSRC}/../include -# OpenSSL extensively uses string literals as char *, which clang -# (reasonably if not exactly rightly) objects to. -CWARNFLAGS.clang+=-Wno-error=incompatible-pointer-types-discards-qualifiers - CRYPTODIST= ${NETBSDSRCDIR}/crypto OPENSSLINC= ${OPENSSLSRC}/include/openssl diff --git a/crypto/external/bsd/openssl/lib/libssl/Makefile b/crypto/external/bsd/openssl/lib/libssl/Makefile index 926f5469fef..c06f50100e9 100644 --- a/crypto/external/bsd/openssl/lib/libssl/Makefile +++ b/crypto/external/bsd/openssl/lib/libssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2023/05/25 16:05:28 riastradh Exp $ +# $NetBSD: Makefile,v 1.17 2023/05/25 19:12:06 riastradh Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -24,10 +24,6 @@ CWARNFLAGS.clang+= -Wno-unused-value # XXX: This warning seems to trigger incorrectly CWARNFLAGS.clang+= -Wno-atomic-alignment -# OpenSSL extensively uses string literals as char *, which clang -# (reasonably if not exactly rightly) objects to. -CWARNFLAGS.clang+=-Wno-error=incompatible-pointer-types-discards-qualifiers - LIB= ssl CPPFLAGS+= -Dlib${LIB} -I${OPENSSLSRC} -I${OPENSSLSRC}/crypto CPPFLAGS+= -I${OPENSSLSRC}/include |
