Fix #80280: ADD_EXTENSION_DEP() fails for ext/standard and ext/date

`ADD_EXTENSION_DEP()` relies on the `PHP_<extname>` config variables to
be set to `"yes"`, and since the standard and date extension are always
enabled, we define the respective variables uncoditionally.

Closes GH-6383.

diff --git a/NEWS b/NEWS
index 31427b1b2d407ed10082ed90c3ef8d577426ffb8..a818b50641e1f8a28f8f83c85c35fe9fd9c6335a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 7.3.25
 
+- Core:
+  . Fixed bug #80280 (ADD_EXTENSION_DEP() fails for ext/standard and ext/date).
+    (cmb)
+
 - IMAP:
   . Fixed bug #64076 (imap_sort() does not return FALSE on failure). (cmb)
   . Fixed bug #76618 (segfault on imap_reopen). (girgias)

diff --git a/ext/date/config.w32 b/ext/date/config.w32
index d25b52df27fdf77dcc6fc525f29cce65894db587..ad3256bf327663fb0efc04032e39d8480aae178a 100755 (executable)
--- a/ext/date/config.w32
+++ b/ext/date/config.w32
@@ -1,6 +1,7 @@
 // vim:ft=javascript
 
 EXTENSION("date", "php_date.c", false, "/Iext/date/lib /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 /DHAVE_TIMELIB_CONFIG_H=1");
+PHP_DATE = "yes";
 ADD_SOURCES("ext/date/lib", "astro.c timelib.c dow.c parse_date.c parse_tz.c tm2unixtime.c unixtime2tm.c parse_iso_intervals.c interval.c", "date");
 AC_DEFINE('HAVE_DATE', 1, 'Have date/time support');
 

diff --git a/ext/standard/config.w32 b/ext/standard/config.w32
index 11e34f8105b7865705355e4d5774addfbc53b634..2ce197b9d74a6c0b7f4a92be49f42b91a3b6b65b 100644 (file)
--- a/ext/standard/config.w32
+++ b/ext/standard/config.w32
@@ -37,7 +37,8 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
        user_filters.c uuencode.c filters.c proc_open.c password.c \
        streamsfuncs.c http.c flock_compat.c random.c hrtime.c", false /* never shared */,
        '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
-       PHP_INSTALL_HEADERS("", "ext/standard");
+PHP_INSTALL_HEADERS("", "ext/standard");
+PHP_STANDARD = "yes";
 if (PHP_MBREGEX != "no") {
        CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_STANDARD", PHP_MBREGEX + ";ext\\mbstring\\oniguruma")
 }