[src/trunk]: src/crypto openssl: Consolidate new CWARNFLAGS.clang stuff in Ma...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0942a79ed47e
branches:  trunk
changeset: 376005:0942a79ed47e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu May 25 19:12:06 2023 +0000

description:
openssl: Consolidate new CWARNFLAGS.clang stuff in Makefile.openssl.

diffstat:

 crypto/Makefile.openssl                            |  6 +++++-
 crypto/external/bsd/openssl/lib/libapps/Makefile   |  6 +-----
 crypto/external/bsd/openssl/lib/libcrypto/Makefile |  6 +-----
 crypto/external/bsd/openssl/lib/libssl/Makefile    |  6 +-----
 4 files changed, 8 insertions(+), 16 deletions(-)

diffs (80 lines):

diff -r 356379832a7f -r 0942a79ed47e crypto/Makefile.openssl
--- a/crypto/Makefile.openssl   Thu May 25 17:37:05 2023 +0000
+++ b/crypto/Makefile.openssl   Thu May 25 19:12:06 2023 +0000
@@ -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 -r 356379832a7f -r 0942a79ed47e crypto/external/bsd/openssl/lib/libapps/Makefile
--- a/crypto/external/bsd/openssl/lib/libapps/Makefile  Thu May 25 17:37:05 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libapps/Makefile  Thu May 25 19:12:06 2023 +0000
@@ -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 -r 356379832a7f -r 0942a79ed47e crypto/external/bsd/openssl/lib/libcrypto/Makefile
--- a/crypto/external/bsd/openssl/lib/libcrypto/Makefile        Thu May 25 17:37:05 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/Makefile        Thu May 25 19:12:06 2023 +0000
@@ -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 -
 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 -r 356379832a7f -r 0942a79ed47e crypto/external/bsd/openssl/lib/libssl/Makefile
--- a/crypto/external/bsd/openssl/lib/libssl/Makefile   Thu May 25 17:37:05 2023 +0000
+++ b/crypto/external/bsd/openssl/lib/libssl/Makefile   Thu May 25 19:12:06 2023 +0000
@@ -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