Skip to content

Commit 2be2707

Browse files
committed
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.
1 parent 12a0918 commit 2be2707

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 7.3.25
44

5+
- Core:
6+
. Fixed bug #80280 (ADD_EXTENSION_DEP() fails for ext/standard and ext/date).
7+
(cmb)
8+
59
- IMAP:
610
. Fixed bug #64076 (imap_sort() does not return FALSE on failure). (cmb)
711
. Fixed bug #76618 (segfault on imap_reopen). (girgias)

ext/date/config.w32

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// vim:ft=javascript
22

33
EXTENSION("date", "php_date.c", false, "/Iext/date/lib /DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 /DHAVE_TIMELIB_CONFIG_H=1");
4+
PHP_DATE = "yes";
45
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");
56
AC_DEFINE('HAVE_DATE', 1, 'Have date/time support');
67

ext/standard/config.w32

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
3737
user_filters.c uuencode.c filters.c proc_open.c password.c \
3838
streamsfuncs.c http.c flock_compat.c random.c hrtime.c", false /* never shared */,
3939
'/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
40-
PHP_INSTALL_HEADERS("", "ext/standard");
40+
PHP_INSTALL_HEADERS("", "ext/standard");
41+
PHP_STANDARD = "yes";
4142
if (PHP_MBREGEX != "no") {
4243
CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_STANDARD", PHP_MBREGEX + ";ext\\mbstring\\oniguruma")
4344
}

0 commit comments

Comments
 (0)