From 53a6d5f20c481bd954bbc27cee2f86c12b3a2503 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Wed, 12 Jun 2024 16:31:25 +0200 Subject: [PATCH] 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. --- ext/spl/config.m4 | 4 ++-- ext/spl/config.w32 | 3 +++ ext/spl/php_spl.c | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ext/spl/config.m4 b/ext/spl/config.m4 index a1b3ca13b4702..397160b7ab20c 100644 --- a/ext/spl/config.m4 +++ b/ext/spl/config.m4 @@ -1,5 +1,5 @@ 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) 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]) -PHP_ADD_EXTENSION_DEP(spl, pcre, true) -PHP_ADD_EXTENSION_DEP(spl, standard, true) PHP_ADD_EXTENSION_DEP(spl, json) +PHP_ADD_EXTENSION_DEP(spl, pcre) +PHP_ADD_EXTENSION_DEP(spl, standard) diff --git a/ext/spl/config.w32 b/ext/spl/config.w32 index 06e87c6633576..dae0e41c266ed 100644 --- a/ext/spl/config.w32 +++ b/ext/spl/config.w32 @@ -3,3 +3,6 @@ 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"); PHP_SPL="yes"; 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"); +ADD_EXTENSION_DEP('spl', 'json'); +ADD_EXTENSION_DEP('spl', 'pcre'); +ADD_EXTENSION_DEP('spl', 'standard'); diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 391d14c354a2a..2ef9870adf923 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -756,6 +756,8 @@ PHP_RSHUTDOWN_FUNCTION(spl) /* {{{ */ static const zend_module_dep spl_deps[] = { ZEND_MOD_REQUIRED("json") + ZEND_MOD_REQUIRED("pcre") + ZEND_MOD_REQUIRED("standard") ZEND_MOD_END };