Skip to content

Commit a3815f0

Browse files
committed
Subject: chore: install PHP 8.4 for Rust extension builds
- Add PHP 8.4 packages to Alpine (php84, php84-dev, php84-cli) - Add PPA and PHP 8.4 packages to Linux (php8.4, php8.4-dev, php8.4-cli) - Add PHP 8.4 to macOS homebrew (php@8.4) - Update DS, SWOOLE, and LLM extension revisions - Update PHP version reference comment to 8.4.17
1 parent deaca27 commit a3815f0

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

build-alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ install_deps() {
2222
ln -s /usr/bin/objcopy "/usr/bin/${arch}-alpine-linux-musl-objcopy"
2323
export CROSS_COMPILE="/usr/bin/${arch}-alpine-linux-musl-"
2424

25-
apk add curl git autoconf bison re2c pkgconf zlib-dev zstd-dev openssl-libs-static openssl-dev zlib-static zlib-dev gnu-libiconv-dev clang-dev llvm-dev
25+
apk add php84 php84-dev php84-cli curl git autoconf bison re2c pkgconf zlib-dev zstd-dev openssl-libs-static openssl-dev zlib-static zlib-dev gnu-libiconv-dev clang-dev llvm-dev
2626

2727
install_curl
2828

build-bash-base.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ set -e
99

1010
PHP_VERSION="$1"
1111
ZSTD_REV="2dfcd6524ccdcef6dfdaa97d7f3716b866885093"
12-
DS_REV="da4d2f2a2c0f3732b34562636849c5e52e79e6c3"
13-
SWOOLE_REV="3e1a1f89930ba0bbea1f5ee31bcd0ee701a87aab"
12+
DS_REV="118c06b8863386ceada4238f3cec18ab84c9efb7"
13+
SWOOLE_REV="d611ff3ca60e8c9425b2e2e3ba1a9004faab64f5"
1414
RDKAFKA_REV="53398031f1cd96e437e9705b67b4dc19d955acb6"
1515
JCHASH_REV="8ed50cc8c211effe1c214eae1e3240622e0f11b0"
1616
SIMDJSON_REV="9a2745669fea733a40f9443b1a793846d0759b89"
17-
LLM_REV="449ecb2dc64deeb5969d109451c3655947a7d26c"
17+
LLM_REV="ab494ede997c56340774a405be766c61ed405f22"
1818
SKIP_SYSTEM_DEPS="$2"
1919
BUILD_DEV="$3"
2020
BUILD_STATIC=1 # Always build static but dev
@@ -114,7 +114,7 @@ if [[ "$BUILD_DEV" == "1" ]]; then
114114
# "--enable-memprof"
115115
# "--enable-memprof-debug"
116116
#
117-
# It does not work with PHP 8.4.2
117+
# It does not work with PHP 8.4.17
118118
# "--enable-tideways-xhprof"
119119
# "--enable-xdebug"
120120
)

build-linux

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ set -xe
1717

1818
install_deps() {
1919
sudo apt-get update -y
20-
sudo apt-get install -y curl build-essential autoconf automake bison re2c libzstd-dev pkg-config git libssl-dev zlib1g-dev libzip-dev libonig-dev cmake libcurl4-openssl-dev libzip-dev librdkafka-dev libiconv-hook-dev wget
20+
sudo apt-get install -y software-properties-common
21+
sudo add-apt-repository ppa:ondrej/php -y
22+
sudo apt-get update -y
23+
sudo apt-get install -y php8.4 php8.4-dev php8.4-cli build-essential clang libclang-dev pkg-config curl autoconf automake bison re2c libzstd-dev git libssl-dev zlib1g-dev libzip-dev libonig-dev cmake libcurl4-openssl-dev librdkafka-dev libiconv-hook-dev wget
2124
# Install LLVM 17 directly from apt.llvm.org
2225
wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/llvm-archive-keyring.gpg
2326
echo "deb [signed-by=/usr/share/keyrings/llvm-archive-keyring.gpg] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" | sudo tee /etc/apt/sources.list.d/llvm.list > /dev/null

build-osx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set -e
1010
. helper.sh
1111

1212
install_deps() {
13-
brew install bash curl autoconf automake bison re2c zstd git openssl zlib cmake libzip librdkafka libiconv llvm@17
13+
brew install php@8.4 bash curl autoconf automake bison re2c zstd git openssl zlib cmake libzip librdkafka libiconv llvm@17
1414

1515
OPENSSL_PREFIX="$(brew --prefix openssl)"
1616
LIBRDKAFKA_PREFIX="$(brew --prefix librdkafka)"

0 commit comments

Comments
 (0)