From deaa58239ced72a6b5d79ca97fec437b7114152c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 14 Dec 2020 08:01:42 +0100 Subject: [PATCH 1/2] simplify extra cflags management --- config.m4 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config.m4 b/config.m4 index 712056d..8ac5ba1 100644 --- a/config.m4 +++ b/config.m4 @@ -51,9 +51,8 @@ if test "$PHP_LIBARCHIVE" != "no"; then ]) CC_FLAG_CHECK([-Wnullability-completeness], [-Wno-nullability-completeness]) - extra_cflags="$cflags_null -fvisibility=hidden" - echo "EXTRA_CFLAGS := \$(EXTRA_CFLAGS) $extra_cflags" >> Makefile.fragments + extra_cflags="-Wall $cflags_null -fvisibility=hidden" PHP_SUBST(ARCHIVE_SHARED_LIBADD) - PHP_NEW_EXTENSION(archive, libarchive.c stream.c, $ext_shared,,-Wall) + PHP_NEW_EXTENSION(archive, libarchive.c stream.c, $ext_shared,,$extra_cflags) fi From e27e0e973f721804b4f343b81a6f8a2462984144 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 14 Dec 2020 08:15:36 +0100 Subject: [PATCH 2/2] report extension and library versions --- libarchive.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libarchive.c b/libarchive.c index fca6029..3c55d42 100644 --- a/libarchive.c +++ b/libarchive.c @@ -30,6 +30,9 @@ static PHP_MINFO_FUNCTION(libarchive) { php_info_print_table_start(); php_info_print_table_header(2, "libarchive support", "enabled"); + php_info_print_table_row(2, "archive extension version", PHP_LIBARCHIVE_VERSION); + php_info_print_table_row(2, "libarchive version", ARCHIVE_VERSION_ONLY_STRING); + php_info_print_table_row(2, "libarchive details", archive_version_details()); php_info_print_table_end(); } /* }}} */