archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add missing pcre dependency definition to zip extension (#14404)

Browse source 
The zip extension also requires the pcre extension.
This commit is contained in:
Peter Kokot 2024-06-01 18:15:18 +02:00 • committed by GitHub
parent 25a5146180
commit dedf8fbffd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/zip/config.m4
View file

@ -63,6 +63,7 @@ if test "$PHP_ZIP" != "no"; then
PHP_ZIP_SOURCES="php_zip.c zip_stream.c" PHP_ZIP_SOURCES="php_zip.c zip_stream.c"
PHP_NEW_EXTENSION(zip, $PHP_ZIP_SOURCES, $ext_shared) PHP_NEW_EXTENSION(zip, $PHP_ZIP_SOURCES, $ext_shared)
PHP_ADD_EXTENSION_DEP(zip, pcre)
PHP_SUBST(ZIP_SHARED_LIBADD) PHP_SUBST(ZIP_SHARED_LIBADD)
fi fi

1
ext/zip/config.w32
View file

@ -9,6 +9,7 @@ if (PHP_ZIP != "no") {
CHECK_LIB("libzip_a.lib", "zip", PHP_ZIP) && CHECK_LIB("libbz2_a.lib", "zip", PHP_ZIP) && CHECK_LIB("zlib_a.lib", "zip", PHP_ZIP) && CHECK_LIB("liblzma_a.lib", "zip", PHP_ZIP)) CHECK_LIB("libzip_a.lib", "zip", PHP_ZIP) && CHECK_LIB("libbz2_a.lib", "zip", PHP_ZIP) && CHECK_LIB("zlib_a.lib", "zip", PHP_ZIP) && CHECK_LIB("liblzma_a.lib", "zip", PHP_ZIP))
) { ) {
EXTENSION('zip', 'php_zip.c zip_stream.c'); EXTENSION('zip', 'php_zip.c zip_stream.c');
ADD_EXTENSION_DEP('zip', 'pcre');
if (get_define("LIBS_ZIP").match("libzip_a(?:_debug)?\.lib")) { if (get_define("LIBS_ZIP").match("libzip_a(?:_debug)?\.lib")) {
/* Using static dependency lib. */ /* Using static dependency lib. */

8
ext/zip/php_zip.c
View file

@ -1146,9 +1146,15 @@ static PHP_MSHUTDOWN_FUNCTION(zip);
static PHP_MINFO_FUNCTION(zip); static PHP_MINFO_FUNCTION(zip);
/* }}} */ /* }}} */
static const zend_module_dep zip_deps[] = {
ZEND_MOD_REQUIRED("pcre")
ZEND_MOD_END
};
/* {{{ zip_module_entry */ /* {{{ zip_module_entry */
zend_module_entry zip_module_entry = { zend_module_entry zip_module_entry = {
STANDARD_MODULE_HEADER, STANDARD_MODULE_HEADER_EX, NULL,
zip_deps,
"zip", "zip",
ext_functions, ext_functions,
PHP_MINIT(zip), PHP_MINIT(zip),