diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-24 16:08:02 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-26 11:03:05 +0100 |
| commit | 2be27074b6e165d8d3e282150d02aa8abfcfec5e (patch) | |
| tree | 091ef67b26bca21503ac9a9a9673a7fdeea487f0 | |
| parent | 12a09183b369779fcf123cdd4fbacee373cc7d98 (diff) | |
| download | php-git-2be27074b6e165d8d3e282150d02aa8abfcfec5e.tar.gz | |
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.
| -rw-r--r-- | NEWS | 4 | ||||
| -rwxr-xr-x | ext/date/config.w32 | 1 | ||||
| -rw-r--r-- | ext/standard/config.w32 | 3 |
3 files changed, 7 insertions, 1 deletions
@@ -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 d25b52df27..ad3256bf32 100755 --- 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 11e34f8105..2ce197b9d7 100644 --- 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") } |