com php-src: Fixed ZTS cache usage: ext/mbstring/config.m4
| From: | Dmitry Stogov | Date: | Tue, 12 Mar 2019 13:58:02 +0000 |
| Subject: | com php-src: Fixed ZTS cache usage: ext/mbstring/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105107@lists.php.net to get a copy of this message | ||
Commit: 7139c381f133eff38e1fcebfa29f35119c8648f4
Author: Dmitry Stogov <dmitry@zend.com> Tue, 12 Mar 2019 16:58:02 +0300
Parents: cf4ee57dc9024362aaf009ac82013cb86f9aa350
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7139c381f133eff38e1fcebfa29f35119c8648f4
Log:
Fixed ZTS cache usage
Changed paths:
M ext/mbstring/config.m4
Diff:
diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 0928534..0cc9c2f 100644
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -29,7 +29,7 @@ AC_DEFUN([PHP_MBSTRING_ADD_INSTALL_HEADERS], [
])
AC_DEFUN([PHP_MBSTRING_EXTENSION], [
- PHP_NEW_EXTENSION(mbstring, $PHP_MBSTRING_SOURCES, $ext_shared,, $PHP_MBSTRING_CFLAGS
-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+ PHP_NEW_EXTENSION(mbstring, $PHP_MBSTRING_BASE_SOURCES $PHP_MBSTRING_SOURCES, $ext_shared,,
$PHP_MBSTRING_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
PHP_SUBST(MBSTRING_SHARED_LIBADD)
for dir in $PHP_MBSTRING_EXTRA_BUILD_DIRS; do
@@ -42,10 +42,8 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
done
if test "$ext_shared" = "no"; then
- PHP_ADD_SOURCES(PHP_EXT_DIR(mbstring), $PHP_MBSTRING_BASE_SOURCES)
out="php_config.h"
else
-
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mbstring),$PHP_MBSTRING_BASE_SOURCES,,shared_objects_mbstring,yes)
if test -f "$ext_builddir/config.h.in"; then
out="$abs_builddir/config.h"
else