Module Name: src
Committed By: riastradh
Date: Thu May 25 19:12:06 UTC 2023
Modified Files:
src/crypto: Makefile.openssl
src/crypto/external/bsd/openssl/lib/libapps: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile
src/crypto/external/bsd/openssl/lib/libssl: Makefile
Log Message:
openssl: Consolidate new CWARNFLAGS.clang stuff in Makefile.openssl.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/crypto/Makefile.openssl
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/lib/libapps/Makefile
cvs rdiff -u -r1.31 -r1.32 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/external/bsd/openssl/lib/libssl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/Makefile.openssl
diff -u src/crypto/Makefile.openssl:1.16 src/crypto/Makefile.openssl:1.17
--- src/crypto/Makefile.openssl:1.16 Tue May 23 12:05:10 2023
+++ src/crypto/Makefile.openssl Thu May 25 19:12:06 2023
@@ -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
Index: src/crypto/external/bsd/openssl/lib/libapps/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.5 src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.6
--- src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.5 Thu May 25 16:05:27 2023
+++ src/crypto/external/bsd/openssl/lib/libapps/Makefile Thu May 25 19:12:06 2023
@@ -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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.31 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.32
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.31 Thu May 25 16:05:28 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile Thu May 25 19:12:06 2023
@@ -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
Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.16 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.17
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.16 Thu May 25 16:05:28 2023
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile Thu May 25 19:12:06 2023
@@ -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
