Skip to content

7.4.33: Add sendmail and switch build to wasixcc #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zebreus wants to merge 11 commits into
base: 7.4.33-wasix
Choose a base branch
from
Open

7.4.33: Add sendmail and switch build to wasixcc #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7a1bfd6
Fix built w.r.t. to new EH sysroot
Arshia001 Sep 2, 2025
c0e1c86
Remove custom sendmail implementation
zebreus Feb 2, 2026
bd3b19b
Use sendmail webc
zebreus Feb 3, 2026
4e375c6
Delete non-eh build scripts
zebreus Feb 9, 2026
0c081a9
Use wasixcc
zebreus Feb 3, 2026
43f359c
Install wasixcc in CI
zebreus Feb 3, 2026
5fc768e
Replace mapdir with volume
zebreus Feb 3, 2026
67e6e6b
Ignore some compiler errors
zebreus Feb 17, 2026
4240a15
Fix exnref build and increase optimization levels
zebreus Feb 19, 2026
93a3f96
Update wasixcc version to 0.4.0
zebreus Feb 23, 2026
ff3f7c5
Update wasixcc version to 0.4.1
zebreus Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/workflows/release-dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release
name: Release to Dev

on:
push:
Expand Down Expand Up @@ -35,9 +35,6 @@ jobs:
build-and-test:
uses: "./.github/workflows/wasix-pr.yaml"
needs: version-check
secrets:
SENDMAIL_DEFAULT_USERNAME: ${{ secrets.SENDMAIL_DEFAULT_USERNAME }}
SENDMAIL_DEFAULT_PASSWORD: ${{ secrets.SENDMAIL_DEFAULT_PASSWORD }}

release:
runs-on: ubuntu-latest
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ jobs:
build-and-test:
uses: "./.github/workflows/wasix-pr.yaml"
needs: version-check
secrets:
SENDMAIL_DEFAULT_USERNAME: ${{ secrets.SENDMAIL_DEFAULT_USERNAME }}
SENDMAIL_DEFAULT_PASSWORD: ${{ secrets.SENDMAIL_DEFAULT_PASSWORD }}

release:
runs-on: ubuntu-latest
Expand Down
187 changes: 25 additions & 162 deletions .github/workflows/wasix-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@ name: WASIX build and test

on:
workflow_call:
secrets:
SENDMAIL_DEFAULT_USERNAME:
required: true
SENDMAIL_DEFAULT_PASSWORD:
required: true
pull_request:
branches:
- "*-wasix"

permissions:
contents: read

jobs:
build-and-test-32:
name: Build and Test - 32-bit
build-and-test:
name: Build and Test
runs-on: ubuntu-latest
strategy:
matrix:
variant: ["32", "64"]
steps:
- name: Check out
uses: actions/checkout@v3
Expand All @@ -32,189 +33,51 @@ jobs:
- name: OS Setup (Ubuntu)
run: |
sudo apt-get update
sudo apt-get install -y build-essential wabt re2c
sudo apt-get install -y build-essential wabt re2c curl xz-utils tar
npm i -g pnpm concurrently

wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 20

wget https://github.com/WebAssembly/binaryen/releases/download/version_123/binaryen-version_123-x86_64-linux.tar.gz
tar -xzf binaryen-version_123-x86_64-linux.tar.gz
sudo cp binaryen-version_123/bin/* /usr/bin/

sudo rm -f /usr/bin/clang
sudo rm -f /usr/bin/clang++
sudo ln -s /usr/bin/clang-20 /usr/bin/clang
sudo ln -s /usr/bin/clang++-20 /usr/bin/clang++
sudo ln -s /usr/bin/llvm-ar-20 /usr/bin/llvm-ar
sudo ln -s /usr/bin/llvm-nm-20 /usr/bin/llvm-nm
sudo ln -s /usr/bin/llvm-ranlib-20 /usr/bin/llvm-ranlib
sudo ln -s /usr/bin/llvm-objdump-20 /usr/bin/llvm-objdump

- name: Tool Versions
run: |
echo clang
clang -v
echo '####################'
echo llvm-ar
llvm-ar -V
echo '####################'
echo llvm-nm
llvm-nm -V
echo '####################'
echo llvm-ranlib
llvm-ranlib -V
echo '####################'
echo wasm-opt
wasm-opt --version
echo '####################'
echo wasm-strip
wasm-strip --version

- name: Download wasix-libc
uses: dsaltares/fetch-gh-release-asset@1.1.2
with:
repo: wasix-org/wasix-libc
file: sysroot-eh.tar.gz
target: sysroot/wasix-libc.tar.gz

- name: Unpack wasix-libc
run: |
cd sysroot
tar xzf wasix-libc.tar.gz
sudo mkdir -p /usr/lib/llvm-20/lib/clang/20/lib/wasm32-unknown-wasi
sudo cp wasix-sysroot-eh/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a \
/usr/lib/llvm-20/lib/clang/20/lib/wasm32-unknown-wasi/libclang_rt.builtins.a

- name: Build
env:
SENDMAIL_DEFAULT_USERNAME: ${{ secrets.SENDMAIL_DEFAULT_USERNAME }}
SENDMAIL_DEFAULT_PASSWORD: ${{ secrets.SENDMAIL_DEFAULT_PASSWORD }}
run: |
export SYSROOT=$(pwd)/sysroot/wasix-sysroot-eh/sysroot
export PHP_WASIX_DEPS=$(pwd)/php-wasix-deps
cd php
bash wasix-configure-eh-32.sh || { cat config.log; exit -1; }

- name: Setup Wasmer
uses: wasmerio/setup-wasmer@v3.1

- name: Run WASIX tests
env:
MAIL_USERNAME: ${{ secrets.SENDMAIL_DEFAULT_USERNAME }}
MAIL_PASSWORD: ${{ secrets.SENDMAIL_DEFAULT_PASSWORD }}
MAIL_HOST: smtp.mailgun.org
MAIL_PORT: 587
run: |
cd php
bash wasix-test-start-containers.sh
conc --kill-others --success "command-1" \
"bash wasix-test-server.sh" \
"bash wasix-test-run.sh"
bash wasix-test-stop-containers.sh
echo All tests are passing! 🎉

- name: Archive build
uses: actions/upload-artifact@v4
with:
name: php-wasix-32
path: php/sapi/cli/php.wasm

build-and-test-64:
name: Build and Test - 64-bit
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v3
- name: Install wasixcc
uses: wasix-org/wasixcc@main
with:
submodules: "recursive"
path: php

- name: Check out php-wasix-deps
uses: actions/checkout@v3
with:
repository: wasix-org/php-wasix-deps
submodules: "recursive"
path: php-wasix-deps

- name: OS Setup (Ubuntu)
run: |
sudo apt-get update
sudo apt-get install -y build-essential wabt re2c
npm i -g pnpm concurrently

wget https://github.com/WebAssembly/binaryen/releases/download/version_123/binaryen-version_123-x86_64-linux.tar.gz
tar -xzf binaryen-version_123-x86_64-linux.tar.gz
sudo cp binaryen-version_123/bin/* /usr/bin/

wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 20

sudo rm -f /usr/bin/clang
sudo rm -f /usr/bin/clang++
sudo ln -s /usr/bin/clang-20 /usr/bin/clang
sudo ln -s /usr/bin/clang++-20 /usr/bin/clang++
sudo ln -s /usr/bin/llvm-ar-20 /usr/bin/llvm-ar
sudo ln -s /usr/bin/llvm-nm-20 /usr/bin/llvm-nm
sudo ln -s /usr/bin/llvm-ranlib-20 /usr/bin/llvm-ranlib
sudo ln -s /usr/bin/llvm-objdump-20 /usr/bin/llvm-objdump
github_token: ${{ secrets.GITHUB_TOKEN }}
sysroot-tag: v2026-02-16.1
version: v0.4.1

- name: Tool Versions
run: |
echo clang
clang -v
echo wasixcc
wasixcc -v
echo '####################'
echo llvm-ar
llvm-ar -V
echo wasixar
wasixar -V
echo '####################'
echo llvm-nm
llvm-nm -V
echo wasixnm
wasixnm -V
echo '####################'
echo llvm-ranlib
llvm-ranlib -V
echo wasixranlib
wasixranlib -V
echo '####################'
echo wasm-opt
wasm-opt --version
echo '####################'
echo wasm-strip
wasm-strip --version

- name: Download wasix-libc
uses: dsaltares/fetch-gh-release-asset@1.1.2
with:
repo: wasix-org/wasix-libc
file: sysroot-eh.tar.gz
target: sysroot/wasix-libc.tar.gz

- name: Unpack wasix-libc
run: |
cd sysroot
tar xzf wasix-libc.tar.gz
sudo mkdir -p /usr/lib/llvm-20/lib/clang/20/lib/wasm32-unknown-wasi
sudo cp wasix-sysroot-eh/lib/wasm32-wasi/libclang_rt.builtins-wasm32.a \
/usr/lib/llvm-20/lib/clang/20/lib/wasm32-unknown-wasi/libclang_rt.builtins.a

- name: Build
env:
SENDMAIL_DEFAULT_USERNAME: ${{ secrets.SENDMAIL_DEFAULT_USERNAME }}
SENDMAIL_DEFAULT_PASSWORD: ${{ secrets.SENDMAIL_DEFAULT_PASSWORD }}
run: |
export SYSROOT=$(pwd)/sysroot/wasix-sysroot-eh/sysroot
export PHP_WASIX_DEPS=$(pwd)/php-wasix-deps
cd php
bash wasix-configure-eh-64.sh || { cat config.log; exit -1; }
bash wasix-configure-eh-${{ matrix.variant }}.sh || { cat config.log; exit -1; }

- name: Setup Wasmer
uses: wasmerio/setup-wasmer@v3.1

- name: Run WASIX tests
env:
MAIL_USERNAME: ${{ secrets.SENDMAIL_DEFAULT_USERNAME }}
MAIL_PASSWORD: ${{ secrets.SENDMAIL_DEFAULT_PASSWORD }}
MAIL_HOST: smtp.mailgun.org
MAIL_PORT: 587
run: |
cd php
bash wasix-test-start-containers.sh
Expand All @@ -227,5 +90,5 @@ jobs:
- name: Archive build
uses: actions/upload-artifact@v4
with:
name: php-wasix-64
path: php/sapi/cli/php.wasm
name: php-wasix-${{ matrix.variant }}
path: php/sapi/cli/php.wasm
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ config.h.in
/scripts/php-config
/scripts/phpize
php
php-debug.wasm
php.wasm

# ------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion build/php.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ AC_DEFUN([PHP_REQUIRE_CXX],[
if test -z "$php_cxx_done"; then
AC_PROG_CXX
AC_PROG_CXXCPP
PHP_ADD_LIBRARY(stdc++)
PHP_ADD_LIBRARY(c++)
Copy link

Copilot AI Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switching the C++ runtime library from stdc++ to c++ can break builds on platforms/toolchains that only ship libstdc++ (common on many Linux distros). Consider making this conditional (e.g., detect which library links successfully) or allowing the library choice to be overridden so non-WASIX builds don't regress.

Suggested change
PHP_ADD_LIBRARY(c++)
dnl Allow overriding the C++ runtime library via PHP_CXX_LIBRARY.
if test -n "$PHP_CXX_LIBRARY"; then
PHP_ADD_LIBRARY([$PHP_CXX_LIBRARY])
else
dnl Prefer libc++ if available, otherwise fall back to libstdc++.
AC_CHECK_LIB([c++],[main],
[PHP_ADD_LIBRARY([c++])],
[AC_CHECK_LIB([stdc++],[main],
[PHP_ADD_LIBRARY([stdc++])],
[])])
fi

Copilot uses AI. Check for mistakes.
php_cxx_done=yes
fi
])
Expand Down
9 changes: 9 additions & 0 deletions ext/opcache/ZendAccelerator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4750,6 +4750,7 @@ static int accel_finish_startup(void)
return FAILURE;
}

#ifndef __wasi__
pid = fork();
if (pid == -1) {
zend_shared_alloc_unlock();
Expand Down Expand Up @@ -4789,6 +4790,14 @@ static int accel_finish_startup(void)
return FAILURE;
}
}
#else
// Note: in WASIX, there is only one uid; it has "root" access to everything within the
// sandbox, but not the base OS, so it's OK to run everything with that user. That is to
// say, we shouldn't need to fork a new process here.
// It is also a fact that forking doesn't work under WASIX+EH anyway.
zend_accel_error(ACCEL_LOG_FATAL, "Preloading cannot fork to spawn a new process in WASIX");
exit(1);
#endif
} else {
if (ZCG(accel_directives).preload_user
&& *ZCG(accel_directives).preload_user) {
Expand Down
9 changes: 0 additions & 9 deletions ext/standard/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,15 +479,6 @@ else
AC_MSG_RESULT(no)
fi

dnl
dnl Include libwasix_sendmail when building to WASIX
dnl
if test "$ac_cv_have_decl___wasi__" == "yes"; then
if test -n "$WASIX_SENDMAIL_LIBS"; then
PHP_EVAL_LIBLINE($WASIX_SENDMAIL_LIBS)
fi
fi

dnl
dnl Whether to enable 64-bit long ints when building to WASIX;
dnl wasm32 uses 32-bit pointers but supports 64-bit int operations.
Expand Down
Loading