Skip to content

Commit 6ec148a

Browse files
committed
Update ext/spl dependencies
This updates and syncs ext/spl dependencies for the configure phase using the PHP_ADD_EXTENSION_DEP in Autotools and ADD_EXTENSION_DEP on Windows. ZEND_MOD_REQUIRED dependencies are listed so that extensions are properly sorted during runtime.
1 parent d545b1d commit 6ec148a

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

ext/spl/config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
22
PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h])
3-
PHP_ADD_EXTENSION_DEP(spl, pcre, true)
4-
PHP_ADD_EXTENSION_DEP(spl, standard, true)
53
PHP_ADD_EXTENSION_DEP(spl, json)
4+
PHP_ADD_EXTENSION_DEP(spl, pcre)
5+
PHP_ADD_EXTENSION_DEP(spl, standard)

ext/spl/config.w32

+3
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
EXTENSION("spl", "php_spl.c spl_functions.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c", false /*never shared */, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
44
PHP_SPL="yes";
55
PHP_INSTALL_HEADERS("ext/spl", "php_spl.h spl_array.h spl_directory.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h");
6+
ADD_EXTENSION_DEP('spl', 'json');
7+
ADD_EXTENSION_DEP('spl', 'pcre');
8+
ADD_EXTENSION_DEP('spl', 'standard');

ext/spl/php_spl.c

+2
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,8 @@ PHP_RSHUTDOWN_FUNCTION(spl) /* {{{ */
756756

757757
static const zend_module_dep spl_deps[] = {
758758
ZEND_MOD_REQUIRED("json")
759+
ZEND_MOD_REQUIRED("pcre")
760+
ZEND_MOD_REQUIRED("standard")
759761
ZEND_MOD_END
760762
};
761763

0 commit comments

Comments
 (0)