From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 26 Oct 2020 10:04:57 +0000 (+0100)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b59e4e8972629d59a1f29d0a371cf68bf7087f2;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #80280: ADD_EXTENSION_DEP() fails for ext/standard and ext/date
---

8b59e4e8972629d59a1f29d0a371cf68bf7087f2
diff --cc NEWS
index 67e9240fa5,a818b50641..a5bc03b9ab
--- a/NEWS
+++ b/NEWS
@@@ -1,7 -1,11 +1,11 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.3.25
 +?? ??? 2020, PHP 7.4.13
  
+ - 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 --cc ext/date/config.w32
index abf12dc732,ad3256bf32..bec0d709cf
mode 100644,100755..100644
--- a/ext/date/config.w32
+++ b/ext/date/config.w32
@@@ -1,7 -1,9 +1,8 @@@
  // 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');
  
  ADD_FLAG('CFLAGS_DATE', "/wd4244");
  
diff --cc ext/standard/config.w32
index 0f47242145,2ce197b9d7..b42efd3c85
--- a/ext/standard/config.w32
+++ b/ext/standard/config.w32
@@@ -37,5 -37,10 +37,6 @@@ EXTENSION("standard", "array.c base64.
  	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_STANDARD = "yes";
 -if (PHP_MBREGEX != "no") {
 -	CHECK_HEADER_ADD_INCLUDE("oniguruma.h", "CFLAGS_STANDARD", PHP_MBREGEX + ";ext\\mbstring\\oniguruma")
 -}
  ADD_MAKEFILE_FRAGMENT();
  PHP_INSTALL_HEADERS("", "ext/standard");