Skip to content

simplify extra cflags management + report versions #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
remicollet wants to merge 2 commits into
base: master
Choose a base branch
from
Open

simplify extra cflags management + report versions #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deaa582
simplify extra cflags management
remicollet Dec 14, 2020
e27e0e9
report extension and library versions
remicollet Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions libarchive.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
/* }}} */
Expand Down