diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-26 11:05:48 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-10-26 11:06:10 +0100 |
| commit | b678df5dc8b54e0da68b0eb3bfcb9ec35e08dbff (patch) | |
| tree | aae4e1b9c45a127aa5a1a358d224ceaecfdc97c4 | |
| parent | 50d75ae05554aaabf4a036ad329d27159f483db1 (diff) | |
| parent | 8b59e4e8972629d59a1f29d0a371cf68bf7087f2 (diff) | |
| download | php-git-b678df5dc8b54e0da68b0eb3bfcb9ec35e08dbff.tar.gz | |
Merge branch 'PHP-7.4' into PHP-8.0
* PHP-7.4:
Fix #80280: ADD_EXTENSION_DEP() fails for ext/standard and ext/date
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/date/config.w32 | 1 | ||||
| -rw-r--r-- | ext/standard/config.w32 | 1 |
3 files changed, 4 insertions, 0 deletions
@@ -5,6 +5,8 @@ PHP NEWS - Core: . Fixed bug #8055 (Abstract trait methods returning "self" cannot be fulfilled by traits). (Nikita) + . Fixed bug #80280 (ADD_EXTENSION_DEP() fails for ext/standard and ext/date). + (cmb) - IMAP: . Fixed bug #76618 (segfault on imap_reopen). (girgias) diff --git a/ext/date/config.w32 b/ext/date/config.w32 index abf12dc732..bec0d709cf 100644 --- 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"); ADD_FLAG('CFLAGS_DATE', "/wd4244"); diff --git a/ext/standard/config.w32 b/ext/standard/config.w32 index d23bfd9db2..3de43d04c0 100644 --- a/ext/standard/config.w32 +++ b/ext/standard/config.w32 @@ -37,5 +37,6 @@ 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_STANDARD = "yes"; ADD_MAKEFILE_FRAGMENT(); PHP_INSTALL_HEADERS("", "ext/standard"); |