git: 90b910f1534f - stable/13 - zlib: Use NO_WDEPRECATED_NON_PROTOTYPE
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 09 Apr 2023 21:35:30 UTC
The branch stable/13 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=90b910f1534fc6f76b79db9107032ee4395ee94c
commit 90b910f1534fc6f76b79db9107032ee4395ee94c
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-02-13 16:15:58 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2023-04-09 14:56:37 +0000
zlib: Use NO_WDEPRECATED_NON_PROTOTYPE
Also add it to kern.mk so it's available for module builds.
Sponsored by: Netflix
Noticed by: mjg
Fixes: b9f235ba3178
Differential Revision: https://reviews.freebsd.org/D38550
(cherry picked from commit b80185c267243a57bbc3e03fd2b47680672d6050)
---
sys/conf/kern.mk | 1 +
sys/modules/zlib/Makefile | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index b6b59a9f13b3..4abef91c7805 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -53,6 +53,7 @@ CWARNEXTRA+= -Wno-error=array-parameter
CWARNEXTRA+= -Wno-error=deprecated-non-prototype
CWARNEXTRA+= -Wno-error=strict-prototypes
CWARNEXTRA+= -Wno-error=unused-but-set-variable
+NO_WDEPRECATED_NON_PROTOTYPE=-Wno-deprecated-non-prototype
.endif
.endif # clang
diff --git a/sys/modules/zlib/Makefile b/sys/modules/zlib/Makefile
index 178d3a3f7ab7..b5a55b9812bb 100644
--- a/sys/modules/zlib/Makefile
+++ b/sys/modules/zlib/Makefile
@@ -25,6 +25,6 @@ CWARNFLAGS.crc32.c+=${NO_WSTRICT_PROTOTYPES} # crc32.c:586
CWARNFLAGS.trees.c+=${NO_WSTRICT_PROTOTYPES} # trees.c:232
CWARNFLAGS.zutil.c+=${NO_WSTRICT_PROTOTYPES} # zutil.c:27,32
-CWARNFLAGS+=-Wno-deprecated-non-prototype
-
.include <bsd.kmod.mk>
+
+CWARNFLAGS+=${NO_WDEPRECATED_NON_PROTOTYPE} # https://github.com/madler/zlib/issues/633