From 8a4ac07eb09a204f6174cdeba64db86a6fb90ee5 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 11 Jun 2024 22:43:58 +0200 Subject: [PATCH] Add missing ext/pcre dependency for ext/pgsql --- ext/pgsql/config.m4 | 1 + ext/pgsql/config.w32 | 1 + ext/pgsql/pgsql.c | 8 +++++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index 7d58564b70ef7..07c848ca688b1 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -93,4 +93,5 @@ if test "$PHP_PGSQL" != "no"; then PHP_ADD_INCLUDE($PGSQL_INCLUDE) PHP_NEW_EXTENSION(pgsql, pgsql.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) + PHP_ADD_EXTENSION_DEP(pgsql, pcre) fi diff --git a/ext/pgsql/config.w32 b/ext/pgsql/config.w32 index e03c5cab5c8ef..e1ee38c30008e 100644 --- a/ext/pgsql/config.w32 +++ b/ext/pgsql/config.w32 @@ -8,6 +8,7 @@ if (PHP_PGSQL != "no") { EXTENSION("pgsql", "pgsql.c", PHP_PGSQL_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); AC_DEFINE('HAVE_PGSQL', 1, 'Have PostgreSQL library'); ADD_FLAG("CFLAGS_PGSQL", "/D PGSQL_EXPORTS /D HAVE_PQFREEMEM /D HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT" + (X64 ? " /D HAVE_PG_LO64" : "") + " "); + ADD_EXTENSION_DEP('pgsql', 'pcre'); } else { WARNING("pgsql not enabled; libraries and headers not found"); } diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 52b925881086b..ca526e1bb6fe3 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -123,9 +123,15 @@ char pgsql_libpq_version[16]; ZEND_DECLARE_MODULE_GLOBALS(pgsql) static PHP_GINIT_FUNCTION(pgsql); +static const zend_module_dep pgsql_module_deps[] = { + ZEND_MOD_REQUIRED("pcre") + ZEND_MOD_END +}; + /* {{{ pgsql_module_entry */ zend_module_entry pgsql_module_entry = { - STANDARD_MODULE_HEADER, + STANDARD_MODULE_HEADER_EX, NULL, + pgsql_module_deps, "pgsql", ext_functions, PHP_MINIT(pgsql),