Skip to content

Commit 91da563

Browse files
committed
Fix GH-1402: PHP 8.* ZTS wrong compilation flag for Linux
1 parent 72f3125 commit 91da563

File tree

4 files changed

+21
-3
lines changed

4 files changed

+21
-3
lines changed

appendices/configure/php.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,18 @@
4747
</para>
4848
</listitem>
4949
</varlistentry>
50+
<varlistentry xml:id="configure.enable-zts">
51+
<term>
52+
<option role="configure">--enable-zts</option>
53+
</term>
54+
<listitem>
55+
<para>
56+
Enables thread safety.
57+
Prior to PHP 8.0.0 on non-Windows systems, the option was called
58+
<option role="configure">--enable-maintainer-zts</option>.
59+
</para>
60+
</listitem>
61+
</varlistentry>
5062
</variablelist>
5163
</sect3>
5264

reference/parallel/setup.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
<simplesect xml:id="parallel.requirements">
88
&reftitle.required;
99
<para>
10-
parallel requires a build of PHP with ZTS (Zend Thread Safety) enabled ( --enable-maintainer-zts or --enable-zts on Windows )
10+
parallel requires a build of PHP with ZTS (Zend Thread Safety) enabled
11+
(<option role="configure">--enable-zts</option>, or on non-Windows systems prior to PHP 8.0.0,
12+
<option role="configure">--enable-maintainer-zts</option>)
1113
</para>
1214
<caution>
1315
<para>

reference/pht/configure.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
&reftitle.install;
66

77
<para>
8-
PHP needs to be built with ZTS (Zend Thread Safety) mode enabled. If PHP is being built from source, then the <option role="configure">--enable-maintainer-zts</option> configuration option (--enable-zts on Windows) must be used.
8+
PHP needs to be built with ZTS (Zend Thread Safety) mode enabled. If PHP is being built from source,
9+
then the <option role="configure">--enable-zts</option> (or on non-Windows systems prior to PHP 8.0.0,
10+
<option role="configure">--enable-maintainer-zts</option>) configuration option must be used.
911
</para>
1012

1113
<para>

reference/pthreads/setup.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
<section xml:id="pthreads.requirements">
88
&reftitle.required;
99
<para>
10-
pthreads requires a build of PHP with ZTS (Zend Thread Safety) enabled ( --enable-maintainer-zts or --enable-zts on Windows )
10+
pthreads requires a build of PHP with ZTS (Zend Thread Safety) enabled
11+
(<option role="configure">--enable-zts</option>, or on non-Windows systems prior to PHP 8.0.0,
12+
<option role="configure">--enable-maintainer-zts</option>)
1113
</para>
1214
<caution>
1315
<para>

0 commit comments

Comments
 (0)