[PATCH 2/2] help: print zlib-ng version number
- From
Toon Claes <toon@iotcl.com>
- Date
- Mar 7, 2025, 14:18 UTC
- Message-ID
- <20250307-toon-zlib-git-version-v1-2-5e8069752bb9@iotcl.com>
- In-Reply-To
- <20250307-toon-zlib-git-version-v1-0-5e8069752bb9@iotcl.com>
When building against zlib-ng, the header file `zlib.h` is not included, but `zlib-ng.h` is included instead. It's `zlib.h` that defines `ZLIB_VERSION` and that macro is used to print out zlib version in `git-version(1)` with `--build-options`. But when it's not defined, no version is printed.
`zlib-ng.h` defines another macro: `ZLIBNG_VERSION`. Use that macro to print the zlib-ng version in `git version --build-options` when it's set. Otherwise fallback to `ZLIB_VERSION`.
Signed-off-by: Toon Claes <toon@iotcl.com> Helped-by: Patrick Steinhardt <ps@pks.im> --- help.c | 4 +++- t/t0091-bugreport.sh | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/help.c b/help.c index 707cd59b79..c54bd9918a 100644 --- a/help.c +++ b/help.c @@ -798,7 +798,9 @@ void get_version_info(struct strbuf *buf, int show_build_options) #if defined OPENSSL_VERSION_TEXT strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT); #endif -#if defined ZLIB_VERSION +#if defined ZLIBNG_VERSION + strbuf_addf(buf, "zlib-ng: %s\n", ZLIBNG_VERSION); +#elif defined ZLIB_VERSION strbuf_addf(buf, "zlib: %s\n", ZLIB_VERSION); #endif } diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh index e11d819b62..e38ca7a901 100755 --- a/t/t0091-bugreport.sh +++ b/t/t0091-bugreport.sh @@ -47,7 +47,8 @@ test_expect_success 'sanity check "System Info" section' ' # This is bound to differ from environment to environment, # so we just do some rather high-level checks. grep "uname: ." system && - grep "compiler info: ." system + grep "compiler info: ." system && + grep "zlib." system ' test_expect_success 'dies if file with same name as report already exists' '
-- 2.49.0.rc1.410.g72b47a15e9