Skip to content

Commit 07ee1b4

Browse files
committed
Remove PM4 support
pthreads v4 will likely not work on PHP 8.3, and is not currently being tested. I don't anticipate needing it in any case, since PM4 EOL is coming up in January.
1 parent 77eafe2 commit 07ee1b4

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

compile.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ LIBZIP_VERSION="1.10.1"
1414
SQLITE3_VERSION="3440200" #3.44.2
1515
LIBDEFLATE_VERSION="dd12ff2b36d603dbb7fa8838fe7e7176fcbd4f6f" #1.19
1616

17-
EXT_PTHREADS_VERSION="4.2.2"
1817
EXT_PMMPTHREAD_VERSION="6.0.12"
1918
EXT_YAML_VERSION="2.2.3"
2019
EXT_LEVELDB_VERSION="317fdcd8415e1566fc2835ce2bdb8e19b890f9f3"
@@ -1031,13 +1030,7 @@ function get_pecl_extension {
10311030
cd "$BUILD_DIR/php"
10321031
write_out "PHP" "Downloading additional extensions..."
10331032

1034-
if [ "$PM_VERSION_MAJOR" -ge 5 ]; then
1035-
get_github_extension "pmmpthread" "$EXT_PMMPTHREAD_VERSION" "pmmp" "ext-pmmpthread"
1036-
THREAD_EXT_FLAGS="--enable-pmmpthread"
1037-
else
1038-
get_github_extension "pthreads" "$EXT_PTHREADS_VERSION" "pmmp" "ext-pmmpthread" #"v" needed for release tags because github removes the "v"
1039-
THREAD_EXT_FLAGS="--enable-pthreads"
1040-
fi
1033+
get_github_extension "pmmpthread" "$EXT_PMMPTHREAD_VERSION" "pmmp" "ext-pmmpthread"
10411034

10421035
get_github_extension "yaml" "$EXT_YAML_VERSION" "php" "pecl-file_formats-yaml"
10431036
#get_pecl_extension "yaml" "$EXT_YAML_VERSION"
@@ -1157,7 +1150,7 @@ $HAS_DEBUG \
11571150
--enable-mbstring \
11581151
--disable-mbregex \
11591152
--enable-calendar \
1160-
$THREAD_EXT_FLAGS \
1153+
--enable-pmmpthread \
11611154
--enable-fileinfo \
11621155
--with-libxml \
11631156
--enable-xml \

windows-compile-vs.bat

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ set PTHREAD_W32_VER=3.0.0
2323
set LEVELDB_MCPE_VER=1c7564468b41610da4f498430e795ca4de0931ff
2424
set LIBDEFLATE_VER=dd12ff2b36d603dbb7fa8838fe7e7176fcbd4f6f
2525

26-
set PHP_PTHREADS_VER=4.2.2
2726
set PHP_PMMPTHREAD_VER=6.0.12
2827
set PHP_YAML_VER=2.2.3
2928
set PHP_CHUNKUTILS2_VER=0.3.5
@@ -219,14 +218,7 @@ cd /D ..
219218
call :pm-echo "Getting additional PHP extensions..."
220219
cd /D php-src\ext
221220

222-
set THREAD_EXT_FLAGS=""
223-
if "%PM_VERSION_MAJOR%" geq "5" (
224-
call :get-extension-zip-from-github "pmmpthread" "%PHP_PMMPTHREAD_VER%" "pmmp" "ext-pmmpthread" || exit 1
225-
set THREAD_EXT_FLAGS="--with-pmmpthread=shared"
226-
) else (
227-
call :get-extension-zip-from-github "pthreads" "%PHP_PTHREADS_VER%" "pmmp" "ext-pmmpthread" || exit 1
228-
set THREAD_EXT_FLAGS="--with-pthreads=shared"
229-
)
221+
call :get-extension-zip-from-github "pmmpthread" "%PHP_PMMPTHREAD_VER%" "pmmp" "ext-pmmpthread" || exit 1
230222
call :get-extension-zip-from-github "yaml" "%PHP_YAML_VER%" "php" "pecl-file_formats-yaml" || exit 1
231223
call :get-extension-zip-from-github "chunkutils2" "%PHP_CHUNKUTILS2_VER%" "pmmp" "ext-chunkutils2" || exit 1
232224
call :get-extension-zip-from-github "igbinary" "%PHP_IGBINARY_VER%" "igbinary" "igbinary" || exit 1
@@ -304,7 +296,7 @@ call configure^
304296
--with-mysqlnd^
305297
--with-openssl^
306298
--with-pcre-jit^
307-
%THREAD_EXT_FLAGS%^
299+
--with-pmmpthread=shared^
308300
--with-simplexml^
309301
--with-sodium^
310302
--with-sqlite3=shared^
@@ -345,11 +337,7 @@ call :pm-echo "Generating php.ini..."
345337
(echo error_reporting=-1)>>"%php_ini%"
346338
(echo zend.assertions=-1)>>"%php_ini%"
347339
(echo extension_dir=ext)>>"%php_ini%"
348-
if "%PM_VERSION_MAJOR%" geq "5" (
349-
(echo extension=php_pmmpthread.dll)>>"%php_ini%"
350-
) else (
351-
(echo extension=php_pthreads.dll)>>"%php_ini%"
352-
)
340+
(echo extension=php_pmmpthread.dll)>>"%php_ini%"
353341
(echo extension=php_openssl.dll)>>"%php_ini%"
354342
(echo extension=php_chunkutils2.dll)>>"%php_ini%"
355343
(echo extension=php_igbinary.dll)>>"%php_ini%"

0 commit comments

Comments
 (0)