From faa8c1901af21f20c5713918d06c3b5bdddb57b7 Mon Sep 17 00:00:00 2001 From: Don Hardman Date: Mon, 9 Oct 2023 20:33:06 +0700 Subject: [PATCH] Add swoole, disable zts and remove parallel extension --- build-alpine | 3 ++- build-bash-base.sh | 12 ++++++------ build-linux | 3 ++- build-osx | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build-alpine b/build-alpine index b6346fd..9adc311 100755 --- a/build-alpine +++ b/build-alpine @@ -52,7 +52,8 @@ ENABLE_STATIC=yes --with-pcre-jit --enable-zstd --with-libzstd \ --enable-pcntl --enable-posix \ --enable-sockets \ - --enable-zts --enable-parallel --enable-ds \ + --enable-ds \ + --enable-swoole \ --with-openssl --with-zlib --with-zip \ --enable-filter \ --with-curl \ diff --git a/build-bash-base.sh b/build-bash-base.sh index 6651ac0..9487a7e 100644 --- a/build-bash-base.sh +++ b/build-bash-base.sh @@ -9,8 +9,8 @@ set -e PHP_VERSION="$1" ZSTD_REV="2dfcd6524ccdcef6dfdaa97d7f3716b866885093" -PARALLEL_REV="25ba1ee594c350b0e3e239c6b995d772d0e4fc9c" DS_REV="d42750d69beb684ec3ef7b3da48fba769ce57ffc" +SWOOLE_REV="b72d22ad65dbcc0a5cf75b4d6a483b73c9f32157" SKIP_SYSTEM_DEPS="$2" BUILD_DEV="$3" BUILD_STATIC=1 # Always build static but dev @@ -43,16 +43,16 @@ cd zstd && git checkout "$ZSTD_REV" # cd zstd && make && cd .. cd .. -# parallel -git clone https://github.com/manticoresoftware/krakjoe-parallel.git parallel -cd parallel && git checkout "$PARALLEL_REV" -cd .. - # ds git clone https://github.com/php-ds/ext-ds.git ds cd ds && git checkout "$DS_REV" cd .. +# openswoole +git clone https://github.com/swoole/swoole-src.git swoole +cd swoole && git checkout "$SWOOLE_REV" +cd .. + cd .. BUILD_EXTRA=() diff --git a/build-linux b/build-linux index 0811218..12df799 100755 --- a/build-linux +++ b/build-linux @@ -42,7 +42,8 @@ ENABLE_STATIC=yes --with-pcre-jit --enable-zstd --with-libzstd \ --enable-pcntl --enable-posix \ --enable-sockets \ - --enable-zts --enable-parallel --enable-ds \ + --enable-ds \ + --enable-swoole \ --with-openssl --with-zlib --with-zip \ --enable-filter \ --with-curl \ diff --git a/build-osx b/build-osx index 24f63ce..c086354 100755 --- a/build-osx +++ b/build-osx @@ -82,7 +82,7 @@ fi --with-pcre-jit --enable-zstd --with-libzstd \ --enable-pcntl --enable-posix \ --enable-sockets \ - --enable-zts --enable-parallel \ + --enable-swoole \ --with-openssl --with-zlib --with-zip \ --enable-filter \ --with-curl \