Update README.md

upgrade libpq to v16.1

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+## What does this PR do?
+
+
+
+## Checklist before merging
+
+> If your PR involves the changes mentioned below and completed the action, please tick the corresponding option.
+> If a modification is not involved, please skip it directly.
+
+- [ ] If it's a extension or dependency update, make sure adding related extensions in `src/global/test-extensions.php`.
+- [ ] If you changed the behavior of static-php-cli, add docs in [static-php/static-php-cli-docs](https://github.com/static-php/static-php-cli-docs) .
+- [ ] If you updated `config/xxxx.json` content, run `bin/spc dev:sort-config xxx`.

.github/workflows/build-linux-arm.yml

@@ -15,6 +15,7 @@ on:
         default: '8.2'
         type: choice
         options:
+          - '8.3'
           - '8.2'
           - '8.1'
           - '8.0'
@@ -51,7 +52,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: downloads
-          key: php-${{ inputs.version }}-dependencies
+          key: php-${{ inputs.version }}-dependencies-${{ inputs.extensions }}
 
       # With or without debug
       - if: inputs.debug == true
@@ -67,7 +68,7 @@ jobs:
 
       # If there's no dependencies cache, fetch sources, with or without debug
       - if: steps.cache-download.outputs.cache-hit != 'true'
-        run: SPC_USE_ARCH=${{ inputs.operating-system }} ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --all ${{ env.SPC_BUILD_DEBUG }}
+        run: SPC_USE_ARCH=${{ inputs.operating-system }} ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }}
 
       # Run build command
       - run: SPC_USE_ARCH=${{ inputs.operating-system }} ./bin/spc-alpine-docker build ${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }}

.github/workflows/build-linux-x86_64.yml

@@ -9,6 +9,7 @@ on:
         default: '8.2'
         type: choice
         options:
+          - '8.3'
           - '8.2'
           - '8.1'
           - '8.0'
@@ -56,7 +57,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: downloads
-          key: php-${{ inputs.version }}-dependencies
+          key: php-${{ inputs.version }}-dependencies-${{ inputs.extensions }}
 
       # With or without debug
       - if: inputs.debug == true
@@ -72,7 +73,7 @@ jobs:
 
       # If there's no dependencies cache, fetch sources, with or without debug
       - if: steps.cache-download.outputs.cache-hit != 'true'
-        run: CACHE_API_EXEC=yes ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --all ${{ env.SPC_BUILD_DEBUG }}
+        run: CACHE_API_EXEC=yes ./bin/spc-alpine-docker download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }}
 
       # Run build command
       - run: ./bin/spc-alpine-docker build ${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }}

.github/workflows/build-macos-x86_64.yml

@@ -9,6 +9,7 @@ on:
         default: '8.2'
         type: choice
         options:
+          - '8.3'
           - '8.2'
           - '8.1'
           - '8.0'
@@ -61,7 +62,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: downloads
-          key: php-${{ inputs.version }}-dependencies
+          key: php-${{ inputs.version }}-dependencies-${{ inputs.extensions }}
 
       # With or without debug
       - if: inputs.debug == true
@@ -77,7 +78,7 @@ jobs:
 
       # If there's no dependencies cache, fetch sources, with or without debug
       - if: steps.cache-download.outputs.cache-hit != 'true'
-        run: ./bin/spc download --with-php=${{ inputs.version }} --all ${{ env.SPC_BUILD_DEBUG }}
+        run: ./bin/spc download --with-php=${{ inputs.version }} --for-extensions=${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }}
 
       # Run build command
       - run: ./bin/spc build ${{ inputs.extensions }} ${{ env.SPC_BUILD_DEBUG }} ${{ env.SPC_BUILD_CLI }} ${{ env.SPC_BUILD_MICRO }} ${{ env.SPC_BUILD_FPM }}

.github/workflows/download-cache.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: [ "8.0", "8.1", "8.2" ]
+        php-version: [ "8.0", "8.1", "8.2", "8.3" ]
     steps:
       - uses: actions/checkout@v3
 

.github/workflows/release-build.yml

@@ -0,0 +1,47 @@
+name: Upload SPC Binary (Release)
+
+on:
+  release:
+    types:
+      - published
+  workflow_dispatch:
+
+jobs:
+  build-release-artifacts:
+    name: "Upload SPC Binary (Release)"
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        operating-system:
+          - "linux-x86_64"
+          - "macos-x86_64"
+          - "linux-aarch64"
+          - "macos-aarch64"
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v4"
+
+      - name: Reuse static-php-cli-hosted artifacts
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          repo: static-php/static-php-cli-hosted
+          branch: master
+          workflow: build-spc-release.yml
+          name: "spc-${{ matrix.operating-system }}"
+
+      - name: "Archive Executable"
+        run: |
+          tar -czf spc-${{ matrix.operating-system }}.tar.gz spc
+          echo "filename=spc-${{ matrix.operating-system }}.tar.gz" >> $GITHUB_ENV
+
+      - name: upload binaries to release
+        uses: softprops/action-gh-release@v1
+        if: ${{startsWith(github.ref, 'refs/tags/') }}
+        with:
+          files: ${{ env.filename }}
+
+      - name: "Upload Artifact"
+        uses: actions/upload-artifact@v3
+        with:
+          path: spc
+          name: spc-${{ matrix.operating-system }}

.github/workflows/tests.yml

@@ -1,98 +1,146 @@
 name: Tests
 
 on:
-    push:
-        branches: [ "main" ]
-    pull_request:
-        branches: [ "main" ]
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
 
 permissions:
-    contents: read
+  contents: read
 
 jobs:
-    php-cs-fixer:
-        runs-on: ubuntu-latest
-        timeout-minutes: 10
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
+  php-cs-fixer:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
 
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: '8.1'
-                  extensions: curl, openssl, mbstring
-                  ini-values: memory_limit=-1
-                  tools: pecl, composer, php-cs-fixer
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          extensions: curl, openssl, mbstring
+          ini-values: memory_limit=-1
+          tools: pecl, composer, php-cs-fixer
 
-            - name: Run PHP-CS-Fixer fix
-              run: php-cs-fixer fix --dry-run --diff --ansi
+      - name: Run PHP-CS-Fixer fix
+        run: php-cs-fixer fix --dry-run --diff --ansi
 
-    phpstan:
-        runs-on: ubuntu-latest
-        timeout-minutes: 10
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
+  phpstan:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
 
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: '8.1'
-                  extensions: curl, openssl, mbstring
-                  ini-values: memory_limit=-1
-                  tools: composer
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.1'
+          extensions: curl, openssl, mbstring
+          ini-values: memory_limit=-1
+          tools: composer
 
-            - name: Cache Composer packages
-              id: composer-cache
-              uses: actions/cache@v3
-              with:
-                  path: vendor
-                  key: ${{ runner.os }}-phpstan-${{ hashFiles('**/composer.lock') }}
-                  restore-keys: |
-                      ${{ runner.os }}-phpstan-
+      - name: "Cache Composer packages"
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-phpstan-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-phpstan-
 
-            - name: Install Dependencies
-              run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+      - name: "Install Dependencies"
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
-            - name: Run phpstan
-              run: vendor/bin/phpstan analyse
+      - name: "Run phpstan"
+        run: vendor/bin/phpstan analyse
 
-    phpunit:
-        name: PHPUnit (PHP ${{ matrix.php }})
-        runs-on: ubuntu-latest
-        timeout-minutes: 10
-        strategy:
-            matrix:
-                include:
-                    - php: '8.1'
-                    - php: '8.2'
-            fail-fast: false
+  phpunit:
+    name: "PHPUnit (PHP ${{ matrix.php }})"
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      matrix:
+        include:
+          - php: '8.1'
+          - php: '8.2'
+          - php: '8.3'
 
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
 
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: "${{ matrix.php }}"
-                  tools: pecl, composer
-                  extensions: curl, openssl, mbstring
-                  ini-values: memory_limit=-1
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "${{ matrix.php }}"
+          tools: pecl, composer
+          extensions: curl, openssl, mbstring
+          ini-values: memory_limit=-1
 
-            - name: Cache Composer packages
-              id: composer-cache
-              uses: actions/cache@v3
-              with:
-                  path: vendor
-                  key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-                  restore-keys: |
-                      ${{ runner.os }}-php-
+      - name: "Cache Composer packages"
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
 
-            - name: Install Dependencies
-              run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+      - name: "Install Dependencies"
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
-            - name: Run PHPUnit tests
-              run: |
-                  vendor/bin/phpunit tests/ --no-coverage
+      - name: "Run PHPUnit Tests"
+        run: |
+          vendor/bin/phpunit tests/ --no-coverage
+
+  build:
+    name: "Build PHP Test (PHP ${{ matrix.php }} ${{ matrix.os }})"
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 120
+    strategy:
+      matrix:
+        php:
+          - "8.0"
+          - "8.1"
+          - "8.2"
+          - "8.3"
+        os:
+          - ubuntu-latest
+          - macos-latest
+      fail-fast: false
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
+
+      - name: "Setup PHP"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          tools: pecl, composer
+          extensions: curl, openssl, mbstring
+          ini-values: memory_limit=-1
+
+      - name: "Cache Composer packages"
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: "Install Dependencies"
+        run: composer update -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: "Run Build Tests (doctor)"
+        run: bin/spc doctor --auto-fix
+
+      - name: "Run Build Tests (download)"
+        run: bin/spc download --for-extensions="$(php src/globals/test-extensions.php)" --with-php=${{ matrix.php }} --debug
+
+      - name: "Run Build Tests (build)"
+        run: bin/spc build "$(php src/globals/test-extensions.php)" --build-cli --build-micro --build-fpm --debug

.gitignore

@@ -4,8 +4,7 @@ docker/libraries/
 docker/extensions/
 docker/source/
 
-# Composer file
-composer.lock
+# Vendor files
 /vendor/
 
 # default source extract directory

README-en.md

@@ -1,245 +1,3 @@
 # static-php-cli
 
-Build single static PHP binary, with PHP project together, with popular extensions included.
-
-The project name is static-php-cli, but it actually supports cli, fpm, micro and embed (on the way) SAPI 😎
-
-Compile a purely static php-cli binary file with various extensions to make PHP applications more portable! (cli SAPI)
-
-<img width="600" alt="2023-05-02 15 53 13" src="https://user-images.githubusercontent.com/20330940/235610282-23e58d68-bd35-4092-8465-171cff2d5ba8.png">
-
-You can also use the micro binary file to combine php binary and php source code into one for distribution!
-This feature is provided by [dixyes/phpmicro](https://github.com/dixyes/phpmicro). (micro SAPI)
-
-<img width="600" alt="2023-05-02 15 52 33" src="https://user-images.githubusercontent.com/20330940/235610318-2ef4e3f1-278b-4ca4-99f4-b38120efc395.png">
-
-[![Version](https://img.shields.io/badge/Version-2.0--rc5-pink.svg?style=flat-square)]()
-[![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)]()
-[![](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/build-linux-x86_64.yml?branch=refactor&label=Linux%20Build&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/build.yml)
-[![](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/build-macos-x86_64.yml?branch=refactor&label=macOS%20Build&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/build.yml)
-
-[![](https://img.shields.io/badge/Extension%20Counter-55+-yellow.svg?style=flat-square)]()
-[![](https://img.shields.io/github/search/crazywhalecc/static-php-cli/TODO?label=TODO%20Counter&style=flat-square)]()
-
-## Compilation Requirements
-
-Yes, this project is written in PHP, pretty funny.
-But static-php-cli runtime only requires an environment above PHP 8.1 and `mbstring`, `pcntl` extension.
-
-Here is the architecture support status, where `CI` represents support for GitHub Action builds, 
-`Local` represents support for local builds, and blank represents not currently supported.
-
-|         | x86_64    | aarch64   |
-|---------|-----------|-----------|
-| macOS   | CI, Local | Local     |
-| Linux   | CI, Local | CI, Local |
-| Windows |           |           |
-
-> macOS-arm64 is not supported for GitHub Actions, if you are going to build on arm, you can build it manually on your own machine.
-
-Currently supported PHP versions for compilation are: `7.3`, `7.4`, `8.0`, `8.1`, `8.2`, `8.3`.
-
-## Docs
-
-docs here: <https://static-php-cli.zhamao.me>.
-
-## Simple Usage
-
-Please first select the extension you want to compile based on the extension list below.
-
-### Direct Download
-
-If you don't compile yourself, you can download pre-compiled artifact from Actions, or from self-hosted server: [Here](https://dl.zhamao.xin/static-php-cli/)
-
-> self-hosted server contains extensions: `bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,gmp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,redis,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip`
-
-### Supported Extensions
-
-[Supported Extension List](https://static-php-cli.zhamao.me/en/guide/extensions.html)
-
-> If there is no extension you need here, you can submit an issue.
-
-### GitHub Actions Build
-
-Use GitHub Action to easily build a statically compiled PHP and phpmicro, 
-and at the same time define the extensions to be compiled by yourself.
-
-1. Fork me.
-2. Go to the Actions of the project and select `CI`.
-3. Select `Run workflow`, fill in the PHP version you want to compile, the target type, and the list of extensions. (extensions comma separated, e.g. `bcmath,curl,mbstring`)
-4. After waiting for about a period of time, enter the corresponding task and get `Artifacts`.
-
-If you enable `debug`, all logs will be output at build time, including compiled logs, for troubleshooting.
-
-- When using ubuntu-latest, it will build linux-x86_64 binary.
-- When using macos-latest, it will build macOS-x86_64 binary.
-
-### Manual Build
-
-Clone repo first:
-
-```bash
-git clone https://github.com/crazywhalecc/static-php-cli.git
-```
-
-If you have not installed php on your system, you can use package management to install PHP (such as brew, apt, yum, apk etc.).
-
-And you can also download single-file php binary and composer using command `bin/setup-runtime`.
-The PHP runtime for static-php-cli itself will be downloaded at `bin/php`, and composer is at `bin/composer`.
-
-```bash
-cd static-php-cli
-chmod +x bin/setup-runtime
-# It will download php-cli from self-hosted server and composer from getcomposer.org
-./bin/setup-runtime
-
-# Use this php runtime to run static-php-cli compiler
-./bin/php bin/spc
-
-# Use composer
-./bin/php bin/composer
-```
-
-Basic usage for building php and micro with some extensions:
-
-```bash
-cd static-php-cli
-composer update
-chmod +x bin/spc
-# Check system tool dependencies, fix them automatically
-./bin/spc doctor
-# fetch all libraries
-./bin/spc fetch --all
-# with bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl extension, build both CLI and phpmicro SAPI
-./bin/spc build bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl --build-cli --build-micro
-```
-
-You can also use the parameter `--with-php=x.y` to specify the downloaded PHP version, currently supports 7.4 ~ 8.2:
-
-```bash
-# Using PHP >= 8.0 is recommended, because PHP7 cannot use phpmicro
-./bin/spc fetch --with-php=8.2 --all
-```
-
-Now we support `cli`, `micro`, `fpm`, you can use one or more of the following parameters to specify the compiled SAPI:
-
-- `--build-cli`: build static cli executable
-- `--build-micro`: build static phpmicro self-extracted executable
-- `--build-fpm`: build static fpm binary
-- `--build-all`: build all
-
-If anything goes wrong, use `--debug` option to display full terminal output:
-
-```bash
-./bin/spc build openssl,pcntl,mbstring --debug --build-all
-./bin/spc fetch --all --debug
-```
-
-In addition, we build NTS by default. If you are going to build ZTS version, just add `--enable-zts` option.
-
-```bash
-./bin/spc build openssl,pcntl --build-all --enable-zts
-```
-
-Adding option `--no-strip` can produce binaries with debug symbols, in order to debug (using gdb). Disabling strip will increase the size of static binary.
-
-### php-cli Usage
-
-> php-cli is a single static binary, you can use it like normal php installed on your system.
-
-When using the parameter `--build-cli` or `--build-all`, 
-the final compilation result will output a binary file named `./php`, 
-which can be distributed and used directly. 
-This file will be located in the directory `buildroot/bin/`, copy it out for use.
-
-```bash
-cd buildroot/bin/
-./php -v                # check version
-./php -m                # check extensions
-./php your_code.php     # run your php code
-./php your_project.phar # run your phar (project archive)
-```
-
-### micro.sfx Usage
-
-> phpmicro is a SelF-extracted eXecutable SAPI module, 
-> provided by [dixyes/phpmicro](https://github.com/dixyes/phpmicro). 
-> It can put php runtime and your source code together.
-
-When using the parameter `--build-all` or `--build-micro`, 
-the final compilation result will output a file named `./micro.sfx`, 
-which needs to be used with your PHP source code like `code.php`. 
-This file will be located in the path `buildroot/bin/micro.sfx`, simply copy it out for use.
-
-Prepare your project source code, which can be a single PHP file or a Phar file, for use.
-
-```bash
-echo "<?php echo 'Hello world' . PHP_EOL;" > code.php
-cat micro.sfx code.php > single-app && chmod +x single-app
-./single-app
-
-# If packing a PHAR file, replace code.php with the Phar file path.
-```
-
-> In some cases, PHAR files may not run in a micro environment.
-
-### php-fpm Usage
-
-When using the parameter `--build-all` or `--build-fpm`,
-the final compilation result will output a file named `./php-fpm`,
-This file will be located in the path `buildroot/bin/`, simply copy it out for use.
-
-In normal Linux distributions and macOS systems, the package manager will automatically generate a default fpm configuration file after installing php-fpm.
-Because php-fpm must specify a configuration file before running, the php-fpm compiled by this project will not have any configuration files, so you need to write `php-fpm.conf` and `pool.conf` configuration files yourself.
-
-Specifying `php-fpm.conf` can use the command parameter `-y`, for example: `./php-fpm -y php-fpm.conf`.
-
-## Contribution
-
-Currently, there are only a few supported extensions. 
-If the extension you need is missing, you can create an issue. 
-If you are familiar with this project, you are also welcome to initiate a pull request.
-
-The basic principles for contributing are as follows:
-
-- This project uses php-cs-fixer and phpstan as code formatting tools. Before contributing, please run `composer analyze` and `composer cs-fix` on the updated code.
-- If other open source libraries are involved, the corresponding licenses should be provided. 
-    Also, configuration files should be sorted using the command `sort-config` after modification.
-    For more information about sorting commands, see the documentation.
-- Naming conventions should be followed, such as using the extension name registered in PHP for the extension name itself, 
-    and external library names should follow the project's own naming conventions. For internal logic functions, class names, variables, etc., 
-    camelCase and underscore formats should be followed, and mixing within the same module is prohibited.
-- When compiling external libraries and creating patches, compatibility with different operating systems should be considered.
-
-If you want to contribute document content, please go to [crazywhalecc/static-php-cli-docs](https://github.com/crazywhalecc/static-php-cli-docs).
-
-Part of the English document is written by me, and part is translated by Google,
-and there may be inaccurate descriptions, strange or offensive expressions.
-If you are a native English speaker, some corrections to the documentation are welcome.
-
-
-## Sponsor this project
-
-You can sponsor my project on [this page](https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md).
-
-## Open-Source License
-
-This project itself is based on MIT License, 
-some newly added extensions and dependencies may originate from the following projects (including but not limited to), 
-and the headers of these code files will also be given additional instructions LICENSE and AUTHOR:
-
-- [dixyes/lwmbs](https://github.com/dixyes/lwmbs) (Mulun Permissive License)
-- [swoole/swoole-cli](https://github.com/swoole/swoole-cli) (Apache 2.0 LICENSE+SWOOLE-CLI LICENSE)
-
-Due to the special nature of this project, 
-many other open source projects such as curl and protobuf will be used during the project compilation process, 
-and they all have their own open source licenses.
-
-Please use the `bin/spc dump-license` command to export the open source licenses used in the project after compilation, 
-and comply with the corresponding project's LICENSE.
-
-## Advanced
-
-The refactoring branch of this project is written modularly. 
-If you are interested in this project and want to join the development,
-you can refer to the [Contribution Guide](https://static-php-cli.zhamao.me) of the documentation to contribute code or documentation.
+English README has been moved to [README.md](README.md).

README-zh.md

@@ -0,0 +1,254 @@
+# static-php-cli
+
+Build single static PHP binary, with PHP project together, with popular extensions included.
+
+🌐 **[中文](README-zh.md)** | **[English](README.md)**
+
+编译纯静态的 PHP Binary 二进制文件，带有各种扩展，让 PHP-cli 应用变得更便携！（cli SAPI）
+
+<img width="600" alt="截屏2023-05-02 15 53 13" src="https://user-images.githubusercontent.com/20330940/235610282-23e58d68-bd35-4092-8465-171cff2d5ba8.png">
+
+同时可以使用 micro 二进制文件，将 PHP 源码和 PHP 二进制构建为一个文件分发！（micro SAPI）
+
+<img width="600" alt="截屏2023-05-02 15 52 33" src="https://user-images.githubusercontent.com/20330940/235610318-2ef4e3f1-278b-4ca4-99f4-b38120efc395.png">
+
+> 该 SAPI 源自 [dixyes/phpmicro](https://github.com/dixyes/phpmicro) 的 [Fork 仓库](https://github.com/static-php/phpmicro)。
+
+[![Version](https://img.shields.io/badge/Version-2.0--rc8-pink.svg?style=flat-square)]()
+[![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)]()
+[![](https://img.shields.io/github/actions/workflow/status/static-php/static-php-cli-hosted/build-php-common.yml?branch=refactor&label=Build%20Common%20Extensions&style=flat-square)](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-common.yml)
+[![](https://img.shields.io/badge/Extension%20Counter-65+-yellow.svg?style=flat-square)]()
+[![](https://img.shields.io/github/search/crazywhalecc/static-php-cli/TODO?label=TODO%20Counter&style=flat-square)]()
+
+> 项目名称是 static-php-cli，但其实支持 cli、fpm、micro 和 embed SAPI 😎
+
+## 文档
+
+目前 README 编写了基本用法。有关 static-php-cli 所有的功能，请点击这里查看文档：<https://static-php.dev>。
+
+## 自托管直接下载
+
+如果你不想自行编译 PHP，可以从本项目现有的示例 Action 下载 Artifact，也可以从自托管的服务器下载。
+
+- [扩展组合 - common](https://dl.static-php.dev/static-php-cli/common/)：common 组合包含了约 [30+](https://dl.static-php.dev/static-php-cli/common/README.txt) 个常用扩展，体积为 22MB 左右。
+- [扩展组合 - bulk](https://dl.static-php.dev/static-php-cli/bulk/)：bulk 组合包含了 [50+](https://dl.static-php.dev/static-php-cli/bulk/README.txt) 个扩展，体积为 70MB 左右。
+- [扩展组合 - minimal](https://dl.static-php.dev/static-php-cli/minimal/)：minimal 组合包含了 [5](https://dl.static-php.dev/static-php-cli/minimal/README.txt) 个扩展，体积为 6MB 左右。
+
+## 使用 static-php-cli 构建 PHP
+
+### 编译环境需求
+
+是的，本项目采用 PHP 编写，编译前需要一个 PHP 环境，比较滑稽。
+但本项目默认可通过自身构建的 micro 和 static-php 二进制运行，其他只需要包含 mbstring、pcntl 扩展和 PHP 版本大于等于 8.1 即可。
+
+下面是架构支持情况，:octocat: 代表支持 GitHub Action 构建，:computer: 代表支持本地构建，空 代表暂不支持。
+
+|         | x86_64               | aarch64              |
+|---------|----------------------|----------------------|
+| macOS   | :octocat: :computer: | :computer:           |
+| Linux   | :octocat: :computer: | :octocat: :computer: |
+| Windows |                      |                      |
+| FreeBSD | :computer:           | :computer:           |
+
+> macOS-arm64 因 GitHub 暂未提供 arm runner，如果要构建 arm 二进制，可以使用手动构建。
+
+目前支持编译的 PHP 版本为：`7.3`，`7.4`，`8.0`，`8.1`，`8.2`，`8.3`。
+
+### 支持的扩展情况
+
+请先根据下方扩展列表选择你要编译的扩展。
+
+- [扩展支持列表](https://static-php.dev/zh/guide/extensions.html)
+- [编译命令生成器](https://static-php.dev/zh/guide/cli-generator.html)
+
+> 如果这里没有你需要的扩展，可以提交 Issue。
+
+### 使用 Actions 构建
+
+使用 GitHub Action 可以方便地构建一个静态编译的 PHP，同时可以自行定义要编译的扩展。
+
+1. Fork 本项目。
+2. 进入项目的 Actions，选择 CI。
+3. 选择 `Run workflow`，填入你要编译的 PHP 版本、目标类型、扩展列表。（扩展列表使用英文逗号分割，例如 `bcmath,curl,mbstring`）
+4. 等待大约一段时间后，进入对应的任务中，获取 `Artifacts`。
+
+如果你选择了 `debug`，则会在构建时输出所有日志，包括编译的日志，以供排查错误。
+
+### 手动构建（使用 SPC 二进制）
+
+本项目提供了一个 static-php-cli 的二进制文件，你可以直接下载对应平台的二进制文件，然后使用它来构建静态的 PHP。目前 `spc` 二进制支持的平台有 Linux 和 macOS。
+
+下面是从 GitHub Action 下载的方法：
+
+1. 进入 [GitHub Action](https://github.com/crazywhalecc/static-php-cli/actions/workflows/release-build.yml)。
+2. 选择一个最新的构建任务，进入后选择 `Artifacts`，下载对应平台的二进制文件。
+3. 解压 `.zip` 文件。解压后，为其添加执行权限：`chmod +x ./spc`。
+
+你也可以从自托管的服务器下载二进制文件：[进入](https://dl.static-php.dev/static-php-cli/spc-bin/nightly/)。
+
+### 手动构建（使用源码）
+
+先克隆本项目：
+
+```bash
+git clone https://github.com/crazywhalecc/static-php-cli.git
+```
+
+如果你本机没有安装 PHP，你需要先使用包管理（例如 brew、apt、yum、apk 等）安装 php。
+
+你也可以通过 `bin/setup-runtime` 命令下载静态编译好的 php-cli 和 Composer。下载的 php 和 Composer 将保存为 `bin/php` 和 `bin/composer`。
+
+```bash
+cd static-php-cli
+chmod +x bin/setup-runtime
+./bin/setup-runtime
+
+# 使用独立的 php 运行 static-php-cli
+./bin/php bin/spc
+
+# 使用 composer
+./bin/php bin/composer
+
+# 初始化本项目
+cd static-php-cli
+composer update
+chmod +x bin/spc
+```
+
+### 使用 static-php-cli 命令行程序
+
+下面是使用 static-php-cli 编译静态 php 和 micro 的基础用法：
+
+> 如果你使用的是打包好的 `spc` 二进制，你需要将下列命令的 `bin/spc` 替换为 `./spc`。
+
+```bash
+# 检查环境依赖，并根据提示的命令安装缺失的编译工具
+./bin/spc doctor
+# 拉取所有依赖库
+./bin/spc fetch --all
+# 只拉取编译指定扩展需要的所有依赖
+./bin/spc download --for-extensions=openssl,pcntl,mbstring,pdo_sqlite
+# 构建包含 bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl 扩展的 php-cli 和 micro.sfx
+./bin/spc build "bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl" --build-cli --build-micro
+```
+
+你也可以使用参数 `--with-php=x.y` 来指定下载的 PHP 版本，目前支持 7.3 ~ 8.3：
+
+```bash
+# 优先考虑使用 >= 8.0 的 PHP 版本，因为 phpmicro 不支持在 PHP7 中构建
+./bin/spc download --with-php=8.2 --all
+```
+
+其中，目前支持构建 cli，micro，fpm 三种静态二进制，使用以下参数的一个或多个来指定编译的 SAPI：
+
+- `--build-cli`：构建 cli 二进制
+- `--build-micro`：构建 phpmicro 自执行二进制
+- `--build-fpm`：构建 fpm
+- `--build-embed`：构建 embed（libphp）
+- `--build-all`：构建所有
+
+如果出现了任何错误，可以使用 `--debug` 参数来展示完整的输出日志，以供排查错误：
+
+```bash
+./bin/spc build openssl,pcntl,mbstring --debug --build-all
+./bin/spc fetch --all --debug
+```
+
+此外，默认编译的 PHP 为 NTS 版本。如需编译线程安全版本（ZTS），只需添加参数 `--enable-zts` 即可。
+
+```bash
+./bin/spc build openssl,pcntl --build-all --enable-zts
+```
+
+同时，你也可以使用参数 `--no-strip` 来关闭裁剪，关闭裁剪后可以使用 gdb 等工具调试，但这样会让静态二进制体积变大。
+
+## 不同 SAPI 的使用
+
+### 使用 cli
+
+> php-cli 是一个静态的二进制文件，类似 Go、Rust 语言编译后的单个可移植的二进制文件。
+
+采用参数 `--build-cli` 或`--build-all` 参数时，最后编译结果会输出一个 `./php` 的二进制文件，此文件可分发、可直接使用。
+该文件编译后会存放在 `buildroot/bin/` 目录中，名称为 `php`，拷贝出来即可。
+
+```bash
+cd buildroot/bin/
+./php -v                # 检查版本
+./php -m                # 检查编译的扩展
+./php your_code.php     # 运行代码
+./php your_project.phar # 运行打包为 phar 单文件的项目
+```
+
+### 使用 micro
+
+> phpmicro 是一个提供自执行二进制 PHP 的项目，本项目依赖 phpmicro 进行编译自执行二进制。详见 [dixyes/phpmicro](https://github.com/dixyes/phpmicro)。
+
+采用项目参数 `--build-micro` 或 `--build-all` 时，最后编译结果会输出一个 `./micro.sfx` 的文件，此文件需要配合你的 PHP 源码使用。
+该文件编译后会存放在 `buildroot/bin/` 目录中，拷贝出来即可。
+
+使用时应准备好你的项目源码文件，可以是单个 PHP 文件，也可以是 Phar 文件。
+
+```bash
+echo "<?php echo 'Hello world' . PHP_EOL;" > code.php
+cat micro.sfx code.php > single-app && chmod +x single-app
+./single-app
+```
+
+如果打包 PHAR 文件，仅需把 code.php 更换为 phar 文件路径即可。
+你可以使用 [box-project/box](https://github.com/box-project/box) 将你的 CLI 项目打包为 Phar，
+然后将它与 phpmicro 结合，生成独立可执行的二进制文件。
+
+```bash
+# 使用 static-php-cli 生成的 micro.sfx 结合，也可以直接使用 cat 命令结合它们
+bin/spc micro:combine my-app.phar
+cat buildroot/bin/micro.sfx my-app.phar > my-app && chmod +x my-app
+
+# 使用 micro:combine 结合可以将 INI 选项注入到二进制中
+bin/spc micro:combine my-app.phar -I "memory_limit=4G" -I "disable_functions=system" --output my-app-2
+```
+
+> 有些情况下的 phar 文件或 PHP 项目可能无法在 micro 环境下运行。
+
+### 使用 fpm
+
+采用项目参数 `--build-fpm` 或 `--build-all` 时，最后编译结果会输出一个 `./php-fpm` 的文件。
+该文件存放在 `buildroot/bin/` 目录，拷贝出来即可使用。
+
+在正常的 Linux 发行版和 macOS 系统中，安装 php-fpm 后包管理会自动生成默认的 fpm 配置文件。
+因为 php-fpm 必须指定配置文件才可启动，本项目编译的 php-fpm 不会带任何配置文件，所以需自行编写 `php-fpm.conf` 和 `pool.conf` 配置文件。
+
+指定 `php-fpm.conf` 可以使用命令参数 `-y`，例如：`./php-fpm -y php-fpm.conf`。
+
+### 使用 embed
+
+采用项目参数 `--build-embed` 或 `--build-all` 时，最后编译结果会输出一个 `libphp.a`、`php-config` 以及一系列头文件，存放在 `buildroot/`，你可以在你的其他代码中引入它们。
+
+如果你知道 [embed SAPI](https://github.com/php/php-src/tree/master/sapi/embed)，你应该知道如何使用它。对于有可能编译用到引入其他库的问题，你可以使用 `buildroot/bin/php-config` 来获取编译时的配置。
+
+另外，有关如何使用此功能的高级示例，请查看[如何使用它构建 FrankenPHP 的静态版本](https://github.com/dunglas/frankenphp/blob/main/docs/static.md)。
+
+## 贡献
+
+如果缺少你需要的扩展，可发起 Issue。如果你对本项目较熟悉，也欢迎为本项目发起 Pull Request。
+
+另外，添加新扩展的贡献方式，可以参考下方 `进阶`。
+
+如果你想贡献文档内容，请到项目仓库 [static-php/static-php-cli-docs](https://github.com/static-php/static-php-cli-docs) 贡献。
+
+## 赞助本项目
+
+你可以在 [我的个人赞助页](https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md) 支持我和我的项目。
+
+## 开源协议
+
+本项目依据旧版本惯例采用 MIT License 开源，部分扩展的集成编译命令参考或修改自以下项目：
+
+- [dixyes/lwmbs](https://github.com/dixyes/lwmbs)（木兰宽松许可证）
+- [swoole/swoole-cli](https://github.com/swoole/swoole-cli)（Apache 2.0 LICENSE、SWOOLE-CLI LICENSE）
+
+因本项目的特殊性，使用项目编译过程中会使用很多其他开源项目，例如 curl、protobuf 等，它们都有各自的开源协议。
+请在编译完成后，使用命令 `bin/spc dump-license` 导出项目使用项目的开源协议，并遵守对应项目的 LICENSE。
+
+## 进阶
+
+本项目重构分支为模块化编写。如果你对本项目感兴趣，想加入开发，可以参照文档的 [贡献指南](https://static-php.dev) 贡献代码或文档。

README.md

@@ -2,214 +2,290 @@
 
 Build single static PHP binary, with PHP project together, with popular extensions included.
 
-**If you are using English, see [English README](README-en.md).**
+🌐 **[中文](README-zh.md)** | **[English](README.md)**
 
-编译纯静态的 PHP Binary 二进制文件，带有各种扩展，让 PHP-cli 应用变得更便携！（cli SAPI）
+The project name is static-php-cli, but it actually supports cli, fpm, micro and embed SAPI 😎
 
-<img width="600" alt="截屏2023-05-02 15 53 13" src="https://user-images.githubusercontent.com/20330940/235610282-23e58d68-bd35-4092-8465-171cff2d5ba8.png">
+Compile a purely static php-cli binary file with various extensions to make PHP applications more portable! (cli SAPI)
 
-同时可以使用 micro 二进制文件，将 PHP 源码和 PHP 二进制构建为一个文件分发！（由 [dixyes/phpmicro](https://github.com/dixyes/phpmicro) 提供支持）（micro SAPI）
+<img width="600" alt="2023-05-02 15 53 13" src="https://user-images.githubusercontent.com/20330940/235610282-23e58d68-bd35-4092-8465-171cff2d5ba8.png">
 
-<img width="600" alt="截屏2023-05-02 15 52 33" src="https://user-images.githubusercontent.com/20330940/235610318-2ef4e3f1-278b-4ca4-99f4-b38120efc395.png">
+You can also use the micro binary file to combine php binary and php source code into one for distribution! (micro SAPI)
 
-[![Version](https://img.shields.io/badge/Version-2.0--rc5-pink.svg?style=flat-square)]()
+<img width="600" alt="2023-05-02 15 52 33" src="https://user-images.githubusercontent.com/20330940/235610318-2ef4e3f1-278b-4ca4-99f4-b38120efc395.png">
+
+> This SAPI feature is from the [Fork](https://github.com/static-php/phpmicro) of [dixyes/phpmicro](https://github.com/dixyes/phpmicro).
+
+[![Version](https://img.shields.io/badge/Version-2.0--rc8-pink.svg?style=flat-square)]()
 [![License](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)]()
 [![](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/build-linux-x86_64.yml?branch=refactor&label=Linux%20Build&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/build.yml)
 [![](https://img.shields.io/github/actions/workflow/status/crazywhalecc/static-php-cli/build-macos-x86_64.yml?branch=refactor&label=macOS%20Build&style=flat-square)](https://github.com/crazywhalecc/static-php-cli/actions/workflows/build.yml)
-[![](https://img.shields.io/badge/Extension%20Counter-55+-yellow.svg?style=flat-square)]()
+
+[![](https://img.shields.io/badge/Extension%20Counter-65+-yellow.svg?style=flat-square)]()
 [![](https://img.shields.io/github/search/crazywhalecc/static-php-cli/TODO?label=TODO%20Counter&style=flat-square)]()
 
-> 项目名称是 static-php-cli，但其实支持 cli、fpm、micro 和 embed（正在路上）SAPI 😎
+## Documentation
 
-## 编译环境需求
+The current README contains basic usage. For all the features of static-php-cli,
+see <https://static-php.dev> .
 
-是的，本项目采用 PHP 编写，编译前需要一个 PHP 环境，比较滑稽。
-但本项目默认可通过自身构建的 micro 和 static-php 二进制运行，其他只需要包含 mbstring、pcntl 扩展和 PHP 版本大于等于 8.1 即可。
+## Direct Download
 
-下面是架构支持情况，`CI` 代表支持 GitHub Action 构建，`Local` 代表支持本地构建，空 代表暂不支持。
+If you don't want to compile yourself, you can download example pre-compiled artifact from [Actions](https://github.com/static-php/static-php-cli-hosted/actions/workflows/build-php-common.yml), or from self-hosted server.
 
-|         | x86_64    | aarch64   |
-|---------|-----------|-----------|
-| macOS   | CI, Local | Local     |
-| Linux   | CI, Local | CI, Local |
-| Windows |           |           |
+Below are several precompiled static-php binaries with different extension combinations,
+which can be downloaded directly according to your needs.
 
-> macOS-arm64 因 GitHub 暂未提供 arm runner，如果要构建 arm 二进制，可以使用手动构建。
+- [Extension-Combination - common](https://dl.static-php.dev/static-php-cli/common/): `common` combination contains about [30+](https://dl.static-php.dev/static-php-cli/common/README.txt) commonly used extensions, and the size is about 22MB.
+- [Extension-Combination - bulk](https://dl.static-php.dev/static-php-cli/bulk/): `bulk` combination contains [50+](https://dl.static-php.dev/static-php-cli/bulk/README.txt) extensions and is about 70MB in size.
+- [Extension-Combination - minimal](https://dl.static-php.dev/static-php-cli/minimal/): `minimal` combination contains [5](https://dl.static-php.dev/static-php-cli/minimal/README.txt) extensions and is about 6MB in size.
 
-目前支持编译的 PHP 版本为：`7.3`，`7.4`，`8.0`，`8.1`，`8.2`，`8.3`。
+## Use static-php-cli to build PHP
 
-## 文档
+### Compilation Requirements
 
-点击这里查看文档：<https://static-php-cli.zhamao.me>。
+Yes, this project is written in PHP, pretty funny.
+But static-php-cli runtime only requires an environment above PHP 8.1 and `mbstring`, `pcntl` extension.
 
-## 使用
+Here is the architecture support status, where :octocat: represents support for GitHub Action builds,
+:computer: represents support for local manual builds, and blank represents not currently supported.
 
-请先根据下方扩展列表选择你要编译的扩展。
+|         | x86_64               | aarch64              |
+|---------|----------------------|----------------------|
+| macOS   | :octocat: :computer: | :computer:           |
+| Linux   | :octocat: :computer: | :octocat: :computer: |
+| Windows |                      |                      |
+| FreeBSD | :computer:           | :computer:           |
 
-### 自托管直接下载
+> macOS-arm64 is not supported for GitHub Actions, if you are going to build on arm, you can build it manually on your own machine.
 
-如果你不想自行编译，可以从本项目现有的 Action 下载 Artifact，也可以从自托管的服务器下载：[进入](https://dl.zhamao.xin/static-php-cli/)
+Currently supported PHP versions for compilation are: `7.3`, `7.4`, `8.0`, `8.1`, `8.2`, `8.3`.
 
-> 自托管的服务器默认包含的扩展有：`bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,gd,gmp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pcntl,pdo,pdo_mysql,pdo_sqlite,phar,posix,redis,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip`
+### Supported Extensions
 
-### 支持的扩展情况
+Please first select the extension you want to compile based on the extension list below.
 
-[扩展支持列表](https://static-php-cli.zhamao.me/zh/guide/extensions.html)
+- [Supported Extension List](https://static-php.dev/en/guide/extensions.html)
+- [Command Generator](https://static-php.dev/en/guide/cli-generator.html)
 
-> 如果这里没有你需要的扩展，可以提交 Issue。
+> If an extension you need is missing, you can submit an issue.
 
-### 使用 Actions 构建
+Here is the current planned roadmap for extension support: [#152](https://github.com/crazywhalecc/static-php-cli/issues/152) .
 
-使用 GitHub Action 可以方便地构建一个静态编译的 PHP 和 phpmicro，同时可以自行定义要编译的扩展。
+### GitHub Actions Build
 
-1. Fork 本项目。
-2. 进入项目的 Actions，选择 CI。
-3. 选择 `Run workflow`，填入你要编译的 PHP 版本、目标类型、扩展列表。（扩展列表使用英文逗号分割，例如 `bcmath,curl,mbstring`）
-4. 等待大约一段时间后，进入对应的任务中，获取 `Artifacts`。
+Use GitHub Action to easily build a statically compiled PHP,
+and at the same time define the extensions to be compiled by yourself.
 
-如果你选择了 `debug`，则会在构建时输出所有日志，包括编译的日志，以供排查错误。
+1. Fork me.
+2. Go to the Actions of the project and select `CI`.
+3. Select `Run workflow`, fill in the PHP version you want to compile, the target type, and the list of extensions. (extensions comma separated, e.g. `bcmath,curl,mbstring`)
+4. After waiting for about a period of time, enter the corresponding task and get `Artifacts`.
 
-### 手动构建
+If you enable `debug`, all logs will be output at build time, including compiled logs, for troubleshooting.
 
-先克隆本项目：
+- When using ubuntu-latest, it will build linux-x86_64 binary.
+- When using macos-latest, it will build macOS-x86_64 binary.
+
+### Manual build (using SPC binary)
+
+This project provides a binary file of static-php-cli.
+You can directly download the binary file of the corresponding platform and then use it to build static PHP.
+Currently, the platforms supported by `spc` binary are Linux and macOS.
+
+Here's how to download from GitHub Actions:
+
+1. Enter [GitHub Actions](https://github.com/crazywhalecc/static-php-cli/actions/workflows/release-build.yml) or [self-hosted nightly builds](https://dl.static-php.dev/static-php-cli/spc-bin/nightly/).
+2. If you download from GHA, select the latest build task, select `Artifacts`, and download the binary file of the corresponding platform.
+3. If you download from GHA, unzip the `.zip` file. After decompressing, add execution permissions to it: `chmod +x ./spc`.
+4. If you download from self-hosted server, download `spc-$os-$arch` file and just use it (don't forget `chmod +x`).
+
+> SPC single-file binary is built by phpmicro and box, and it doesn't need to install PHP. Just treat `spc` as a standalone executable.
+
+### Manual build (using source code)
+
+Clone repo first:
 
 ```bash
 git clone https://github.com/crazywhalecc/static-php-cli.git
 ```
 
-如果你本机没有安装 PHP，你需要先使用包管理（例如 brew、apt、yum、apk 等）安装 php。
+If you have not installed php on your system, you can use package management to install PHP (such as brew, apt, yum, apk etc.).
 
-你也可以通过 `bin/setup-runtime` 命令下载静态编译好的 php-cli 和 Composer。下载的 php 和 Composer 将保存为 `bin/php` 和 `bin/composer`。
+And you can also download single-file php binary and composer using command `bin/setup-runtime`.
+The PHP runtime for static-php-cli itself will be downloaded at `bin/php`, and composer is at `bin/composer`.
 
 ```bash
 cd static-php-cli
 chmod +x bin/setup-runtime
+# It will download php-cli from self-hosted server and composer from getcomposer.org
 ./bin/setup-runtime
 
-# 使用独立的 php 运行 static-php-cli
+# Use this php runtime to run static-php-cli compiler
 ./bin/php bin/spc
 
-# 使用 composer
+# Use composer
 ./bin/php bin/composer
-```
 
-下面是使用 static-php-cli 编译静态 php 和 micro 的基础用法：
-
-```bash
-# 克隆本项目
+# Initialize this project
 cd static-php-cli
 composer update
 chmod +x bin/spc
-# 检查环境依赖，并根据提示的命令安装缺失的编译工具
-./bin/spc doctor
-# 拉取所有依赖库
-./bin/spc fetch --all
-# 构建包含 bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl 扩展的 php-cli 和 micro.sfx
-./bin/spc build "bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl" --build-cli --build-micro
 ```
 
-你也可以使用参数 `--with-php=x.y` 来指定下载的 PHP 版本，目前支持 7.3 ~ 8.3：
+### Use static-php-cli
+
+Basic usage for building php and micro with some extensions:
+
+> If you are using the packaged `spc` binary, you need to replace `bin/spc` with `./spc` in the following commands.
 
 ```bash
-# 优先考虑使用 >= 8.0 的 PHP 版本，因为 phpmicro 不支持在 PHP7 中构建
+# Check system tool dependencies, fix them if possible
+./bin/spc doctor
+# fetch all libraries
+./bin/spc download --all
+# only fetch necessary sources by needed extensions
+./bin/spc download --for-extensions=openssl,pcntl,mbstring,pdo_sqlite
+# with bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl extension, build both CLI and phpmicro SAPI
+./bin/spc build bcmath,openssl,tokenizer,sqlite3,pdo_sqlite,ftp,curl --build-cli --build-micro
+```
+
+You can also use the parameter `--with-php=x.y` to specify the downloaded PHP version, currently supports 7.4 ~ 8.3:
+
+```bash
+# Using PHP >= 8.0 is recommended, because PHP7 cannot use phpmicro
 ./bin/spc fetch --with-php=8.2 --all
 ```
 
-其中，目前支持构建 cli，micro，fpm 三种静态二进制，使用以下参数的一个或多个来指定编译的 SAPI：
+Now we support `cli`, `micro`, `fpm`, you can use one or more of the following parameters to specify the compiled SAPI:
 
-- `--build-cli`：构建 cli 二进制
-- `--build-micro`：构建 phpmicro 自执行二进制
-- `--build-fpm`：构建 fpm
-- `--build-all`：构建所有
+- `--build-cli`: build static cli executable
+- `--build-micro`: build static phpmicro self-extracted executable
+- `--build-fpm`: build static fpm binary
+- `--build-embed`: build embed (libphp)
+- `--build-all`: build all
 
-如果出现了任何错误，可以使用 `--debug` 参数来展示完整的输出日志，以供排查错误：
+If anything goes wrong, use `--debug` option to display full terminal output:
 
 ```bash
 ./bin/spc build openssl,pcntl,mbstring --debug --build-all
 ./bin/spc fetch --all --debug
 ```
 
-此外，默认编译的 PHP 为 NTS 版本。如需编译线程安全版本（ZTS），只需添加参数 `--enable-zts` 即可。
+In addition, we build NTS (non-thread-safe) by default. If you are going to build ZTS version, just add `--enable-zts` option.
 
 ```bash
 ./bin/spc build openssl,pcntl --build-all --enable-zts
 ```
 
-同时，你也可以使用参数 `--no-strip` 来关闭裁剪，关闭裁剪后可以使用 gdb 等工具调试，但这样会让静态二进制体积变大。
+Adding option `--no-strip` can produce binaries with debug symbols, in order to debug (using gdb). Disabling strip will increase the size of static binary.
 
-### 使用 php-cli
+## Different SAPI Usage
 
-> php-cli 是一个静态的二进制文件，类似 Go、Rust 语言编译后的单个可移植的二进制文件。
+### Use cli
 
-采用参数 `--build-cli` 或`--build-all` 参数时，最后编译结果会输出一个 `./php` 的二进制文件，此文件可分发、可直接使用。
-该文件编译后会存放在 `buildroot/bin/` 目录中，名称为 `php`，拷贝出来即可。
+> php-cli is a single static binary, you can use it like normal php installed on your system.
+
+When using the parameter `--build-cli` or `--build-all`,
+the final compilation result will output a binary file named `./php`,
+which can be distributed and used directly.
+This file will be located in the directory `buildroot/bin/`, copy it out for use.
 
 ```bash
 cd buildroot/bin/
-./php -v                # 检查版本
-./php -m                # 检查编译的扩展
-./php your_code.php     # 运行代码
-./php your_project.phar # 运行打包为 phar 单文件的项目
+./php -v                # check version
+./php -m                # check extensions
+./php your_code.php     # run your php code
+./php your_project.phar # run your phar (project archive)
 ```
 
-### 使用 micro.sfx
+### Use micro
 
-> phpmicro 是一个提供自执行二进制 PHP 的项目，本项目依赖 phpmicro 进行编译自执行二进制。详见 [dixyes/phpmicro](https://github.com/dixyes/phpmicro)。
+> phpmicro is a SelF-extracted eXecutable SAPI module,
+> provided by [phpmicro](https://github.com/dixyes/phpmicro) project.
+> But this project is using a [fork](https://github.com/static-php/phpmicro) of phpmicro, because we need to add some features to it.
+> It can put php runtime and your source code together.
 
-采用项目参数 `--build-micro` 或 `--build-all` 时，最后编译结果会输出一个 `./micro.sfx` 的文件，此文件需要配合你的 PHP 源码使用。
-该文件编译后会存放在 `buildroot/bin/` 目录中，拷贝出来即可。
+When using the parameter `--build-all` or `--build-micro`,
+the final compilation result will output a file named `./micro.sfx`,
+which needs to be used with your PHP source code like `code.php`.
+This file will be located in the path `buildroot/bin/micro.sfx`, simply copy it out for use.
 
-使用时应准备好你的项目源码文件，可以是单个 PHP 文件，也可以是 Phar 文件。
+Prepare your project source code, which can be a single PHP file or a Phar file, for use.
 
 ```bash
 echo "<?php echo 'Hello world' . PHP_EOL;" > code.php
 cat micro.sfx code.php > single-app && chmod +x single-app
 ./single-app
-
-# 如果打包 PHAR 文件，仅需把 code.php 更换为 phar 文件路径即可
 ```
 
-> 有些情况下的 phar 文件可能无法在 micro 环境下运行。
+If you package a PHAR file, just replace `code.php` with the phar file path.
+You can use [box-project/box](https://github.com/box-project/box) to package your CLI project as Phar,
+It is then combined with phpmicro to produce a standalone executable binary.
 
-### 使用 php-fpm
+```bash
+# Use the micro.sfx generated by static-php-cli to combine,
+bin/spc micro:combine my-app.phar
+# or you can directly use the cat command to combine them.
+cat buildroot/bin/micro.sfx my-app.phar > my-app && chmod +x my-app
 
-采用项目参数 `--build-fpm` 或 `--build-all` 时，最后编译结果会输出一个 `./php-fpm` 的文件。
-该文件存放在 `buildroot/bin/` 目录，拷贝出来即可使用。
+# Use micro:combine combination to inject INI options into the binary.
+bin/spc micro:combine my-app.phar -I "memory_limit=4G" -I "disable_functions=system" --output my-app-2
+```
 
-在正常的 Linux 发行版和 macOS 系统中，安装 php-fpm 后包管理会自动生成默认的 fpm 配置文件。
-因为 php-fpm 必须指定配置文件才可启动，本项目编译的 php-fpm 不会带任何配置文件，所以需自行编写 `php-fpm.conf` 和 `pool.conf` 配置文件。
+> In some cases, PHAR files may not run in a micro environment. Overall, micro is not production ready.
 
-指定 `php-fpm.conf` 可以使用命令参数 `-y`，例如：`./php-fpm -y php-fpm.conf`。
+### Use fpm
 
-## 贡献
+When using the parameter `--build-all` or `--build-fpm`,
+the final compilation result will output a file named `./php-fpm`,
+This file will be located in the path `buildroot/bin/`, simply copy it out for use.
 
-目前支持的扩展较少，如果缺少你需要的扩展，可发起 Issue。如果你对本项目较熟悉，也欢迎为本项目发起 Pull Request。
+In common Linux distributions and macOS systems, the package manager will automatically generate a default fpm configuration file after installing php-fpm.
+Because php-fpm must specify a configuration file before running, the php-fpm compiled by this project will not have any configuration files, so you need to write `php-fpm.conf` and `pool.conf` configuration files yourself.
 
-贡献基本原则如下：
+Specifying `php-fpm.conf` can use the command parameter `-y`, for example: `./php-fpm -y php-fpm.conf`.
 
-- 项目采用了 php-cs-fixer、phpstan 作为代码规范工具，贡献前请对更新的代码执行 `composer analyze` 和 `composer cs-fix`。
-- 涉及到其他开源库的部分应提供对应库的协议，同时对配置文件在修改后采用命令 `sort-config` 排序。有关排序的命令，见文档。
-- 应遵循命名规范，例如扩展名称应采取 PHP 内注册的扩展名本身，外部库名应遵循项目本身的名称，内部逻辑的函数、类名、变量等应遵循驼峰、下划线等格式，禁止同一模块混用。
-- 涉及编译外部库的命令和 Patch 时应注意兼容不同操作系统。
+### Use embed
 
-另外，添加新扩展的贡献方式，可以参考下方 `进阶`。
+When using the project parameters `--build-embed` or `--build-all`,
+the final compilation result will output a `libphp.a`, `php-config` and a series of header files,
+stored in `buildroot/`. You can introduce them in your other projects.
 
-如果你想贡献文档内容，请到项目仓库 [crazywhalecc/static-php-cli-docs](https://github.com/crazywhalecc/static-php-cli-docs) 贡献。
+If you know [embed SAPI](https://github.com/php/php-src/tree/master/sapi/embed), you should know how to use it.
+You may require the introduction of other libraries during compilation,
+you can use `buildroot/bin/php-config` to obtain the compile-time configuration.
 
-## 赞助本项目
+For an advanced example of how to use this feature, take a look at [how to use it to build a static version of FrankenPHP](https://github.com/dunglas/frankenphp/blob/main/docs/static.md).
 
-你可以在 [我的个人赞助页](https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md) 支持我和我的项目。
+## Contribution
 
-## 开源协议
+If the extension you need is missing, you can create an issue.
+If you are familiar with this project, you are also welcome to initiate a pull request.
 
-本项目依据旧版本惯例采用 MIT License 开源，自身的部分代码引用或修改自以下项目：
+If you want to contribute documentation, please go to [static-php/static-php-cli-docs](https://github.com/static-php/static-php-cli-docs).
 
-- [dixyes/lwmbs](https://github.com/dixyes/lwmbs)（木兰宽松许可证）
-- [swoole/swoole-cli](https://github.com/swoole/swoole-cli)（Apache 2.0 LICENSE、SWOOLE-CLI LICENSE）
+Now there is a [static-php](https://github.com/static-php) organization, which is used to store the repo related to the project.
 
-因本项目的特殊性，使用项目编译过程中会使用很多其他开源项目，例如 curl、protobuf 等，它们都有各自的开源协议。
-请在编译完成后，使用命令 `bin/spc dump-license` 导出项目使用项目的开源协议，并遵守对应项目的 LICENSE。
+## Sponsor this project
 
-## 进阶
+You can sponsor my project on [this page](https://github.com/crazywhalecc/crazywhalecc/blob/master/FUNDING.md).
+
+## Open-Source License
+
+This project itself is based on MIT License,
+some newly added extensions and dependencies may originate from the the other projects,
+and the headers of these code files will also be given additional instructions LICENSE and AUTHOR.
+
+These are similar projects:
+
+- [dixyes/lwmbs](https://github.com/dixyes/lwmbs)
+- [swoole/swoole-cli](https://github.com/swoole/swoole-cli)
+
+Due to the special nature of this project,
+many other open source projects such as curl and protobuf will be used during the project compilation process,
+and they all have their own open source licenses.
+
+Please use the `bin/spc dump-license` command to export the open source licenses used in the project after compilation,
+and comply with the corresponding project's LICENSE.
 
-本项目重构分支为模块化编写。如果你对本项目感兴趣，想加入开发，可以参照文档的 [贡献指南](https://static-php-cli.zhamao.me) 贡献代码或文档。

bin/setup-runtime

@@ -25,7 +25,7 @@ __DIR__=$(cd "$(dirname "$0")" && pwd)
 __PROJECT__=$(cd "${__DIR__}"/../ && pwd)
 
 # set download dir
-__PHP_RUNTIME_URL__="https://dl.zhamao.xin/static-php-cli/php-8.2.6-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
+__PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/common/php-8.2.12-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
 __COMPOSER_URL__="https://getcomposer.org/download/latest-stable/composer.phar"
 
 # use china mirror
@@ -46,7 +46,7 @@ done
 
 case "$mirror" in
 china)
-  __PHP_RUNTIME_URL__="https://dl.zhamao.xin/static-php-cli/php-8.2.6-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
+  __PHP_RUNTIME_URL__="https://dl.static-php.dev/static-php-cli/common/php-8.2.12-cli-${__OS_FIXED__}-${__ARCH__}.tar.gz"
   __COMPOSER_URL__="https://mirrors.aliyun.com/composer/composer.phar"
   ;;
 

bin/spc-alpine-docker

@@ -59,12 +59,12 @@ RUN apk update; \
     apk add --no-cache \
         autoconf \
         automake \
+        gettext \
         bash \
         binutils \
         bison \
         build-base \
         cmake \
-        composer \
         curl \
         file \
         flex \
@@ -73,25 +73,31 @@ RUN apk update; \
         git \
         jq \
         libgcc \
+        libtool \
         libstdc++ \
         linux-headers \
         m4 \
         make \
-        php81 \
-        php81-common \
-        php81-pcntl \
-        php81-phar \
-        php81-posix \
-        php81-tokenizer \
-        php81-xml \
+        php82 \
+        php82-common \
+        php82-pcntl \
+        php82-phar \
+        php82-posix \
+        php82-sodium \
+        php82-tokenizer \
+        php82-dom \
+        php82-xml \
+        php82-xmlwriter \
+        composer \
         pkgconfig \
         wget \
         xz
+
 WORKDIR /app
 ADD ./src /app/src
-ADD ./composer.json /app/composer.json
+COPY ./composer.* /app/
 ADD ./bin /app/bin
-RUN composer update --no-dev --classmap-authoritative
+RUN composer install --no-dev --classmap-authoritative
 EOF
 fi
 

box.json

@@ -0,0 +1,19 @@
+{
+  "alias": "spc-php.phar",
+  "banner": false,
+  "blacklist": [
+    ".github"
+  ],
+  "directories": [
+    "config",
+    "src",
+    "vendor/psr",
+    "vendor/laravel/prompts",
+    "vendor/illuminate",
+    "vendor/symfony",
+    "vendor/zhamao"
+  ],
+  "git-commit-short": "git_commit_short",
+  "metadata": "ConsoleApplication::VERSION",
+  "output": "spc.phar"
+}

composer.json

@@ -12,7 +12,7 @@
         "php": ">= 8.1",
         "ext-mbstring": "*",
         "ext-pcntl": "*",
-        "laravel/prompts": "^0.1.3",
+        "laravel/prompts": "^0.1.12",
         "symfony/console": "^5.4 || ^6 || ^7",
         "zhamao/logger": "^1.0"
     },
@@ -20,6 +20,7 @@
         "captainhook/captainhook": "^5.10",
         "captainhook/plugin-composer": "^5.3",
         "friendsofphp/php-cs-fixer": "^3.25",
+        "humbug/box": "^4.3",
         "nunomaduro/collision": "^7.8",
         "phpstan/phpstan": "^1.10",
         "phpunit/phpunit": "^10.3"
@@ -44,7 +45,8 @@
     "scripts": {
         "analyse": "phpstan analyse --memory-limit 300M",
         "cs-fix": "php-cs-fixer fix",
-        "test": "vendor/bin/phpunit tests/ --no-coverage"
+        "test": "vendor/bin/phpunit tests/ --no-coverage",
+        "build:phar": "vendor/bin/box compile"
     },
     "config": {
         "allow-plugins": {

config/ext.json

@@ -118,7 +118,7 @@
     "iconv": {
         "type": "builtin",
         "arg-type": "with-prefix",
-        "lib-depends-windows": [
+        "lib-depends": [
             "libiconv"
         ]
     },
@@ -132,12 +132,12 @@
     },
     "imap": {
         "type": "builtin",
-        "arg-type": "with",
+        "arg-type": "custom",
         "lib-depends": [
             "imap"
         ],
         "lib-suggests": [
-            "kerberos"
+            "openssl"
         ]
     },
     "inotify": {
@@ -146,16 +146,22 @@
     },
     "intl": {
         "type": "builtin",
-        "cpp-extension": true,
         "lib-depends": [
             "icu"
         ]
     },
     "ldap": {
         "type": "builtin",
-        "arg-type": "with",
+        "arg-type": "with-prefix",
         "lib-depends": [
             "ldap"
+        ],
+        "lib-suggests": [
+            "gmp",
+            "libsodium"
+        ],
+        "ext-suggests": [
+            "openssl"
         ]
     },
     "mbregex": {
@@ -163,14 +169,14 @@
         "arg-type": "custom",
         "ext-depends": [
             "mbstring"
+        ],
+        "lib-depends": [
+            "onig"
         ]
     },
     "mbstring": {
         "type": "builtin",
-        "arg-type": "custom",
-        "lib-depends": [
-            "onig"
-        ]
+        "arg-type": "custom"
     },
     "memcache": {
         "type": "external",
@@ -222,13 +228,18 @@
         ]
     },
     "opcache": {
-        "type": "builtin"
+        "type": "builtin",
+        "arg-type": "custom"
     },
     "openssl": {
         "type": "builtin",
-        "arg-type": "with",
+        "arg-type": "custom",
         "lib-depends": [
-            "openssl"
+            "openssl",
+            "zlib"
+        ],
+        "ext-depends": [
+            "zlib"
         ]
     },
     "pcntl": {
@@ -296,6 +307,11 @@
             "aspell"
         ]
     },
+    "rar": {
+        "type": "external",
+        "source": "rar",
+        "cpp-extension": true
+    },
     "readline": {
         "type": "builtin",
         "arg-type": "with-prefix",
@@ -420,7 +436,7 @@
     },
     "tidy": {
         "type": "builtin",
-        "arg-type": "with",
+        "arg-type": "with-prefix",
         "lib-depends": [
             "tidy"
         ]
@@ -488,7 +504,7 @@
     },
     "zlib": {
         "type": "builtin",
-        "arg-type": "with",
+        "arg-type": "custom",
         "arg-type-windows": "enable",
         "lib-depends": [
             "zlib"

config/lib.json

@@ -63,6 +63,7 @@
         ],
         "frameworks": [
             "CoreFoundation",
+            "CoreServices",
             "SystemConfiguration"
         ]
     },
@@ -110,6 +111,7 @@
     },
     "icu": {
         "source": "icu",
+        "cpp-library": true,
         "static-libs-unix": [
             "libicui18n.a",
             "libicuio.a",
@@ -121,24 +123,46 @@
         "source": "imagemagick",
         "static-libs-unix": [
             "libMagick++-7.Q16HDRI.a",
-            "libMagickCore-7.Q16HDRI.a",
-            "libMagickWand-7.Q16HDRI.a"
+            "libMagickWand-7.Q16HDRI.a",
+            "libMagickCore-7.Q16HDRI.a"
         ],
         "lib-depends": [
             "zlib",
             "libpng",
             "libjpeg",
-            "bzip2",
             "libwebp",
             "freetype"
         ],
         "lib-suggests": [
             "zstd",
             "xz",
+            "bzip2",
             "libzip",
             "libxml2"
         ]
     },
+    "imap": {
+        "source": "imap",
+        "static-libs-unix": [
+            "libc-client.a"
+        ],
+        "lib-suggests": [
+            "openssl"
+        ]
+    },
+    "ldap": {
+        "source": "ldap",
+        "static-libs-unix": [
+            "liblber.a",
+            "libldap.a"
+        ],
+        "lib-depends": [
+            "openssl",
+            "zlib",
+            "gmp",
+            "libsodium"
+        ]
+    },
     "libavif": {
         "source": "libavif",
         "static-libs-unix": [
@@ -210,7 +234,7 @@
     "libpng": {
         "source": "libpng",
         "static-libs-unix": [
-            "libpng.a"
+            "libpng16.a"
         ],
         "static-libs-windows": [
             "libpng16_static.lib"
@@ -288,8 +312,7 @@
         ],
         "lib-suggests-windows": [
             "icu",
-            "xz",
-            "pthreads4w"
+            "xz"
         ]
     },
     "libxslt": {
@@ -421,19 +444,10 @@
             "readline"
         ],
         "lib-suggests": [
-            "icu"
-        ]
-    },
-    "pthreads4w": {
-        "source": "pthreads4w",
-        "static-libs-windows": [
-            "libpthreadVC3.lib"
-        ],
-        "headers-windows": [
-            "_ptw32.h",
-            "pthread.h",
-            "sched.h",
-            "semaphore.h"
+            "icu",
+            "libxslt",
+            "ldap",
+            "zstd"
         ]
     },
     "readline": {
@@ -451,10 +465,9 @@
             "libsnappy.a"
         ],
         "headers-unix": [
+            "snappy.h",
             "snappy-c.h",
             "snappy-sinksource.h",
-            "snappy.h",
-            "snappy-stubs-internal.h",
             "snappy-stubs-public.h"
         ],
         "lib-depends": [
@@ -471,6 +484,12 @@
             "sqlite3ext.h"
         ]
     },
+    "tidy": {
+        "source": "tidy",
+        "static-libs-unix": [
+            "libtidy.a"
+        ]
+    },
     "xz": {
         "source": "xz",
         "static-libs-unix": [

ext-support.md

@@ -1,3 +1,3 @@
 # Extension List
 
-See: [Docs - Extensions](https://static-php-cli.zhamao.me/en/guide/extensions.html)
+See: [Docs - Extensions](https://static-php.dev/en/guide/extensions.html)

src/SPC/ConsoleApplication.php

@@ -4,7 +4,16 @@ declare(strict_types=1);
 
 namespace SPC;
 
-use SPC\store\FileSystem;
+use SPC\command\BuildCliCommand;
+use SPC\command\BuildLibsCommand;
+use SPC\command\dev\AllExtCommand;
+use SPC\command\dev\PhpVerCommand;
+use SPC\command\dev\SortConfigCommand;
+use SPC\command\DoctorCommand;
+use SPC\command\DownloadCommand;
+use SPC\command\DumpLicenseCommand;
+use SPC\command\ExtractCommand;
+use SPC\command\MicroCombineCommand;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\HelpCommand;
 use Symfony\Component\Console\Command\ListCommand;
@@ -12,38 +21,30 @@ use Symfony\Component\Console\Command\ListCommand;
 /**
  * static-php-cli console app entry
  */
-class ConsoleApplication extends Application
+final class ConsoleApplication extends Application
 {
-    public const VERSION = '2.0-rc6';
+    public const VERSION = '2.0.0-rc9';
 
-    /**
-     * @throws \ReflectionException
-     * @throws exception\FileSystemException
-     */
     public function __construct()
     {
         parent::__construct('static-php-cli', self::VERSION);
 
-        global $argv;
+        $this->addCommands(
+            [
+                new BuildCliCommand(),
+                new BuildLibsCommand(),
+                new DoctorCommand(),
+                new DownloadCommand(),
+                new DumpLicenseCommand(),
+                new ExtractCommand(),
+                new MicroCombineCommand(),
 
-        // Detailed debugging errors are not displayed in the production environment. Only the error display provided by Symfony console is used.
-        $this->setCatchExceptions(file_exists(ROOT_DIR . '/.prod') || !in_array('--debug', $argv));
-
-        // Add subcommands by scanning the directory src/static-php-cli/command/
-        $commands = FileSystem::getClassesPsr4(ROOT_DIR . '/src/SPC/command', 'SPC\\command');
-        $phar = class_exists('\\Phar') && \Phar::running() || !class_exists('\\Phar');
-        $commands = array_filter($commands, function ($y) use ($phar) {
-            $archive_blacklist = [
-                'SPC\command\dev\SortConfigCommand',
-                'SPC\command\DeployCommand',
-            ];
-            if ($phar && in_array($y, $archive_blacklist)) {
-                return false;
-            }
-            $reflection = new \ReflectionClass($y);
-            return !$reflection->isAbstract() && !$reflection->isInterface();
-        });
-        $this->addCommands(array_map(function ($x) { return new $x(); }, $commands));
+                // Dev commands
+                new AllExtCommand(),
+                new PhpVerCommand(),
+                new SortConfigCommand(),
+            ]
+        );
     }
 
     protected function getDefaultCommands(): array

src/SPC/builder/BuilderBase.php

@@ -69,7 +69,7 @@ abstract class BuilderBase
         foreach ($libraries as $library) {
             // if some libs are not supported (but in config "lib.json", throw exception)
             if (!isset($support_lib_list[$library])) {
-                throw new RuntimeException('library [' . $library . '] is in the lib.json list but not supported to compile, but in the future I will support it!');
+                throw new WrongUsageException('library [' . $library . '] is in the lib.json list but not supported to compile, but in the future I will support it!');
             }
             $lib = new ($support_lib_list[$library])($this);
             $this->addLib($lib);
@@ -85,7 +85,7 @@ abstract class BuilderBase
 
         // build all libs
         foreach ($this->libs as $lib) {
-            match ($lib->tryBuild()) {
+            match ($lib->tryBuild($this->getOption('rebuild', false))) {
                 BUILD_STATUS_OK => logger()->info('lib [' . $lib::NAME . '] build success'),
                 BUILD_STATUS_ALREADY => logger()->notice('lib [' . $lib::NAME . '] already built'),
                 BUILD_STATUS_FAILED => logger()->error('lib [' . $lib::NAME . '] build failed'),
@@ -112,6 +112,16 @@ abstract class BuilderBase
         return $this->libs[$name] ?? null;
     }
 
+    /**
+     * Get all library objects.
+     *
+     * @return LibraryBase[]
+     */
+    public function getLibs(): array
+    {
+        return $this->libs;
+    }
+
     /**
      * Add extension to build.
      */
@@ -139,23 +149,27 @@ abstract class BuilderBase
     }
 
     /**
-     * Check if there is a cpp extension.
+     * Check if there is a cpp extensions or libraries.
      *
      * @throws FileSystemException
      * @throws WrongUsageException
      */
-    public function hasCppExtension(): bool
+    public function hasCpp(): bool
     {
         // judge cpp-extension
         $exts = array_keys($this->getExts());
-        $cpp = false;
         foreach ($exts as $ext) {
             if (Config::getExt($ext, 'cpp-extension', false) === true) {
-                $cpp = true;
-                break;
+                return true;
             }
         }
-        return $cpp;
+        $libs = array_keys($this->getLibs());
+        foreach ($libs as $lib) {
+            if (Config::getLib($lib, 'cpp-library', false) === true) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**
@@ -227,12 +241,35 @@ abstract class BuilderBase
 
     /**
      * Get PHP Version ID from php-src/main/php_version.h
+     *
+     * @throws RuntimeException
+     * @throws WrongUsageException
      */
     public function getPHPVersionID(): int
     {
+        if (!file_exists(SOURCE_PATH . '/php-src/main/php_version.h')) {
+            throw new WrongUsageException('PHP source files are not available, you need to download them first');
+        }
+
         $file = file_get_contents(SOURCE_PATH . '/php-src/main/php_version.h');
-        preg_match('/PHP_VERSION_ID (\d+)/', $file, $match);
-        return intval($match[1]);
+        if (preg_match('/PHP_VERSION_ID (\d+)/', $file, $match) !== 0) {
+            return intval($match[1]);
+        }
+
+        throw new RuntimeException('PHP version file format is malformed, please remove it and download again');
+    }
+
+    public function getPHPVersion(): string
+    {
+        if (!file_exists(SOURCE_PATH . '/php-src/main/php_version.h')) {
+            throw new WrongUsageException('PHP source files are not available, you need to download them first');
+        }
+        $file = file_get_contents(SOURCE_PATH . '/php-src/main/php_version.h');
+        if (preg_match('/PHP_VERSION "(.*)"/', $file, $match) !== 0) {
+            return $match[1];
+        }
+
+        throw new RuntimeException('PHP version file format is malformed, please remove it and download again');
     }
 
     /**
@@ -252,6 +289,9 @@ abstract class BuilderBase
         if (($type & BUILD_TARGET_FPM) === BUILD_TARGET_FPM) {
             $ls[] = 'fpm';
         }
+        if (($type & BUILD_TARGET_EMBED) === BUILD_TARGET_EMBED) {
+            $ls[] = 'embed';
+        }
         return implode(', ', $ls);
     }
 
@@ -292,6 +332,18 @@ abstract class BuilderBase
         $this->options[$key] = $value;
     }
 
+    public function getEnvString(array $vars = ['cc', 'cxx', 'ar', 'ld']): string
+    {
+        $env = [];
+        foreach ($vars as $var) {
+            $var = strtoupper($var);
+            if (getenv($var) !== false) {
+                $env[] = "{$var}=" . getenv($var);
+            }
+        }
+        return implode(' ', $env);
+    }
+
     /**
      * Check if all libs are downloaded.
      * If not, throw exception.

src/SPC/builder/BuilderProvider.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\builder;
 
+use SPC\builder\freebsd\BSDBuilder;
 use SPC\builder\linux\LinuxBuilder;
 use SPC\builder\macos\MacOSBuilder;
 use SPC\exception\FileSystemException;
@@ -31,6 +32,7 @@ class BuilderProvider
             // ),
             'Darwin' => new MacOSBuilder($input->getOptions()),
             'Linux' => new LinuxBuilder($input->getOptions()),
+            'BSD' => new BSDBuilder($input->getOptions()),
             default => throw new WrongUsageException('Current OS "' . PHP_OS_FAMILY . '" is not supported yet'),
         };
     }

src/SPC/builder/Extension.php

@@ -46,6 +46,7 @@ class Extension
                 break;
             case 'Darwin':
             case 'Linux':
+            case 'BSD':
                 $arg .= $this->getUnixConfigureArg();
                 break;
         }
@@ -162,6 +163,35 @@ class Extension
         return false;
     }
 
+    /**
+     * Run compile check if build target is cli
+     * If you need to run some check, overwrite this or add your assert in src/globals/tests/{extension_name}.php
+     * If check failed, throw RuntimeException
+     *
+     * @throws RuntimeException
+     */
+    public function runCliCheck(): void
+    {
+        [$ret] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php --ri "' . $this->getDistName() . '"', false);
+        if ($ret !== 0) {
+            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: php-cli returned ' . $ret);
+        }
+
+        if (file_exists(ROOT_DIR . '/src/globals/tests/' . $this->getName() . '.php')) {
+            // Trim additional content & escape special characters to allow inline usage
+            $test = str_replace(
+                ['<?php', 'declare(strict_types=1);', "\n", '"', '$'],
+                ['', '', '', '\"', '\$'],
+                file_get_contents(ROOT_DIR . '/src/globals/tests/' . $this->getName() . '.php')
+            );
+
+            [$ret] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php -r "' . trim($test) . '"');
+            if ($ret !== 0) {
+                throw new RuntimeException('extension ' . $this->getName() . ' failed sanity check');
+            }
+        }
+    }
+
     /**
      * @throws RuntimeException
      */

src/SPC/builder/LibraryBase.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace SPC\builder;
 
-use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
@@ -19,6 +18,8 @@ abstract class LibraryBase
 
     protected array $dependencies = [];
 
+    protected bool $patched = false;
+
     /**
      * @throws RuntimeException
      */
@@ -130,10 +131,15 @@ abstract class LibraryBase
      */
     public function tryBuild(bool $force_build = false): int
     {
+        if (file_exists($this->source_dir . '/.spc.patched')) {
+            $this->patched = true;
+        }
         // force means just build
         if ($force_build) {
             logger()->info('Building required library [' . static::NAME . ']');
-            $this->patchBeforeBuild();
+            if (!$this->patched && $this->patchBeforeBuild()) {
+                file_put_contents($this->source_dir . '/.spc.patched', 'PATCHED!!!');
+            }
             $this->build();
             return BUILD_STATUS_OK;
         }
@@ -153,7 +159,7 @@ abstract class LibraryBase
             }
         }
         // pkg-config is treated specially. If it is pkg-config, check if the pkg-config binary exists
-        if ($this instanceof MacOSLibraryBase && static::NAME === 'pkg-config' && !file_exists(BUILD_ROOT_PATH . '/bin/pkg-config')) {
+        if (static::NAME === 'pkg-config' && !file_exists(BUILD_ROOT_PATH . '/bin/pkg-config')) {
             $this->tryBuild(true);
             return BUILD_STATUS_OK;
         }

src/SPC/builder/extension/glfw.php

@@ -17,10 +17,19 @@ class glfw extends Extension
      */
     public function patchBeforeBuildconf(): bool
     {
+        if (file_exists(SOURCE_PATH . '/php-src/ext/glfw')) {
+            return false;
+        }
         FileSystem::copyDir(SOURCE_PATH . '/ext-glfw', SOURCE_PATH . '/php-src/ext/glfw');
         return true;
     }
 
+    public function patchBeforeConfigure(): bool
+    {
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/configure', '-lglfw ', '-lglfw3 ');
+        return true;
+    }
+
     public function getUnixConfigureArg(): string
     {
         return '--enable-glfw --with-glfw-dir=' . BUILD_ROOT_PATH;

src/SPC/builder/extension/iconv.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\builder\macos\MacOSBuilder;
 use SPC\util\CustomExt;
 
 #[CustomExt('iconv')]
@@ -13,6 +14,9 @@ class iconv extends Extension
     public function patchBeforeConfigure(): bool
     {
         // macOS need to link iconv dynamically, we add it to extra-libs
+        if (!$this->builder instanceof MacOSBuilder) {
+            return false;
+        }
         $extra_libs = $this->builder->getOption('extra-libs', '');
         if (!str_contains($extra_libs, '-liconv')) {
             $extra_libs .= ' -liconv';

src/SPC/builder/extension/imagick.php

@@ -5,17 +5,18 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\builder\linux\LinuxBuilder;
 use SPC\util\CustomExt;
 
 #[CustomExt('imagick')]
 class imagick extends Extension
 {
-    public function patchBeforeBuildconf(): bool
+    public function patchBeforeMake(): bool
     {
-        // linux need to link library manually, we add it to extra-libs
+        // imagick may call omp_pause_all which requires -lgomp
         $extra_libs = $this->builder->getOption('extra-libs', '');
-        if (!str_contains($extra_libs, 'libMagickCore')) {
-            $extra_libs .= ' /usr/lib/libMagick++-7.Q16HDRI.a /usr/lib/libMagickCore-7.Q16HDRI.a /usr/lib/libMagickWand-7.Q16HDRI.a';
+        if ($this->builder instanceof LinuxBuilder) {
+            $extra_libs .= ' -lgomp ';
         }
         $this->builder->setOption('extra-libs', $extra_libs);
         return true;

src/SPC/builder/extension/imap.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\exception\WrongUsageException;
+use SPC\util\CustomExt;
+
+#[CustomExt('imap')]
+class imap extends Extension
+{
+    /**
+     * @throws WrongUsageException
+     */
+    public function getUnixConfigureArg(): string
+    {
+        if ($this->builder->getOption('enable-zts')) {
+            throw new WrongUsageException('ext-imap is not thread safe, do not build it with ZTS builds');
+        }
+        $arg = '--with-imap=' . BUILD_ROOT_PATH;
+        if ($this->builder->getLib('openssl') !== null) {
+            $arg .= ' --with-imap-ssl=' . BUILD_ROOT_PATH;
+        }
+        return $arg;
+    }
+}

src/SPC/builder/extension/mbregex.php

@@ -5,18 +5,25 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\exception\RuntimeException;
 use SPC\util\CustomExt;
 
 #[CustomExt('mbregex')]
 class mbregex extends Extension
 {
-    public function getDistName(): string
-    {
-        return 'mbstring';
-    }
-
     public function getConfigureArg(): string
     {
         return '';
     }
+
+    /**
+     * mbregex is not an extension, we need to overwrite the default check.
+     */
+    public function runCliCheck(): void
+    {
+        [$ret] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php --ri "mbstring" | grep regex', false);
+        if ($ret !== 0) {
+            throw new RuntimeException('extension ' . $this->getName() . ' failed compile check: compiled php-cli mbstring extension does not contain regex !');
+        }
+    }
 }

src/SPC/builder/extension/mongodb.php

@@ -5,11 +5,20 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\store\FileSystem;
 use SPC\util\CustomExt;
 
 #[CustomExt('mongodb')]
 class mongodb extends Extension
 {
+    public function patchBeforeBuildconf(): bool
+    {
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/mongodb/config.m4', 'if test -z "$PHP_CONFIG"; then', 'if false; then');
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/mongodb/config.m4', 'PHP_MONGODB_PHP_VERSION=`${PHP_CONFIG} --version`', 'PHP_MONGODB_PHP_VERSION=' . $this->builder->getPHPVersion());
+        FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/ext/mongodb/config.m4', 'PHP_MONGODB_PHP_VERSION_ID=`${PHP_CONFIG} --vernum`', 'PHP_MONGODB_PHP_VERSION_ID=' . $this->builder->getPHPVersionID());
+        return true;
+    }
+
     public function getUnixConfigureArg(): string
     {
         $arg = ' --enable-mongodb ';

src/SPC/builder/extension/opcache.php

@@ -5,11 +5,25 @@ declare(strict_types=1);
 namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
+use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
 use SPC\util\CustomExt;
 
 #[CustomExt('opcache')]
 class opcache extends Extension
 {
+    /**
+     * @throws WrongUsageException
+     * @throws RuntimeException
+     */
+    public function getUnixConfigureArg(): string
+    {
+        if ($this->builder->getPHPVersionID() < 80000) {
+            throw new WrongUsageException('Statically compiled PHP with Zend Opcache only available for PHP >= 8.0 !');
+        }
+        return '--enable-opcache';
+    }
+
     public function getDistName(): string
     {
         return 'Zend Opcache';

src/SPC/builder/extension/openssl.php

@@ -6,7 +6,6 @@ namespace SPC\builder\extension;
 
 use SPC\builder\Extension;
 use SPC\util\CustomExt;
-use SPC\util\Util;
 
 #[CustomExt('openssl')]
 class openssl extends Extension
@@ -14,12 +13,18 @@ class openssl extends Extension
     public function patchBeforeMake(): bool
     {
         // patch openssl3 with php8.0 bug
-        if (file_exists(SOURCE_PATH . '/openssl/VERSION.dat') && Util::getPHPVersionID() < 80100) {
+        if (file_exists(SOURCE_PATH . '/openssl/VERSION.dat') && $this->builder->getPHPVersionID() < 80100) {
             $openssl_c = file_get_contents(SOURCE_PATH . '/php-src/ext/openssl/openssl.c');
             $openssl_c = preg_replace('/REGISTER_LONG_CONSTANT\s*\(\s*"OPENSSL_SSLV23_PADDING"\s*.+;/', '', $openssl_c);
             file_put_contents(SOURCE_PATH . '/php-src/ext/openssl/openssl.c', $openssl_c);
             return true;
         }
+
         return false;
     }
+
+    public function getUnixConfigureArg(): string
+    {
+        return '--with-openssl=' . BUILD_ROOT_PATH . ' --with-openssl-dir=' . BUILD_ROOT_PATH;
+    }
 }

src/SPC/builder/extension/sodium.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('sodium')]
+class sodium extends Extension
+{
+    public function patchBeforeBuildconf(): bool
+    {
+        // bypass error: unknown warning option '-Wno-logical-op' for macOS
+        return $this->removeLineContainingString();
+    }
+
+    private function removeLineContainingString(): bool
+    {
+        $path = SOURCE_PATH . '/php-src/ext/sodium/config.m4';
+        $search = '-Wno-logical-op';
+        if (!file_exists($path)) {
+            return false;
+        }
+        $content = file_get_contents($path);
+        $lines = preg_split('/\r\n|\n/', $content);
+        $filteredLines = array_filter($lines, function ($line) use ($search) {
+            return strpos($line, $search) === false;
+        });
+        $newContent = implode("\n", $filteredLines);
+        file_put_contents($path, $newContent);
+        return true;
+    }
+}

src/SPC/builder/extension/swoole.php

@@ -13,11 +13,12 @@ class swoole extends Extension
     public function getUnixConfigureArg(): string
     {
         $arg = '--enable-swoole';
-        $arg .= $this->builder->getExt('pgsql') ? ' --enable-swoole-pgsql' : ' --disable-swoole-pgsql';
+        // pgsql hook is buggy for static php
+        $arg .= ' --disable-swoole-pgsql';
         $arg .= $this->builder->getLib('openssl') ? ' --enable-openssl' : ' --disable-openssl --without-openssl';
-        $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : '';
-        // curl hook is buggy for static php
-        $arg .= ' --disable-swoole-curl';
+        $arg .= $this->builder->getLib('brotli') ? (' --enable-brotli --with-brotli-dir=' . BUILD_ROOT_PATH) : ' --disable-brotli';
+        // swoole curl hook is buggy for php 8.0
+        $arg .= $this->builder->getExt('curl') && $this->builder->getPHPVersionID() >= 80100 ? ' --enable-swoole-curl' : ' --disable-swoole-curl';
         return $arg;
     }
 }

src/SPC/builder/extension/swow.php

@@ -7,7 +7,6 @@ namespace SPC\builder\extension;
 use SPC\builder\Extension;
 use SPC\exception\RuntimeException;
 use SPC\util\CustomExt;
-use SPC\util\Util;
 
 #[CustomExt('swow')]
 class swow extends Extension
@@ -25,7 +24,7 @@ class swow extends Extension
      */
     public function patchBeforeBuildconf(): bool
     {
-        if (Util::getPHPVersionID() >= 80000 && !is_link(SOURCE_PATH . '/php-src/ext/swow')) {
+        if ($this->builder->getPHPVersionID() >= 80000 && !is_link(SOURCE_PATH . '/php-src/ext/swow')) {
             if (PHP_OS_FAMILY === 'Windows') {
                 f_passthru('cd ' . SOURCE_PATH . '/php-src/ext && mklink /D swow swow-src\ext');
             } else {

src/SPC/builder/extension/zlib.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('zlib')]
+class zlib extends Extension
+{
+    public function getUnixConfigureArg(): string
+    {
+        return '--with-zlib --with-zlib-dir="' . BUILD_ROOT_PATH . '"';
+    }
+}

src/SPC/builder/freebsd/BSDBuilder.php

@@ -0,0 +1,253 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\freebsd;
+
+use SPC\builder\BuilderBase;
+use SPC\builder\traits\UnixBuilderTrait;
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
+use SPC\store\SourcePatcher;
+
+class BSDBuilder extends BuilderBase
+{
+    /** Unix compatible builder methods */
+    use UnixBuilderTrait;
+
+    /** @var bool Micro patch phar flag */
+    private bool $phar_patched = false;
+
+    /**
+     * @throws RuntimeException
+     * @throws WrongUsageException
+     * @throws FileSystemException
+     */
+    public function __construct(array $options = [])
+    {
+        $this->options = $options;
+
+        // ---------- set necessary options ----------
+        // set C Compiler (default: clang)
+        f_putenv('CC=' . $this->getOption('cc', 'clang'));
+        // set C++ Composer (default: clang++)
+        f_putenv('CXX=' . $this->getOption('cxx', 'clang++'));
+        // set PATH
+        f_putenv('PATH=' . BUILD_ROOT_PATH . '/bin:' . getenv('PATH'));
+        // set PKG_CONFIG
+        f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
+        // set PKG_CONFIG_PATH
+        f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig/');
+
+        // set arch (default: current)
+        $this->setOptionIfNotExist('arch', php_uname('m'));
+        $this->setOptionIfNotExist('gnu-arch', arch2gnu($this->getOption('arch')));
+
+        // ---------- set necessary compile environments ----------
+        // concurrency
+        $this->concurrency = SystemUtil::getCpuCount();
+        // cflags
+        $this->arch_c_flags = SystemUtil::getArchCFlags($this->getOption('arch'));
+        $this->arch_cxx_flags = SystemUtil::getArchCFlags($this->getOption('arch'));
+        // cmake toolchain
+        $this->cmake_toolchain_file = SystemUtil::makeCmakeToolchainFile('BSD', $this->getOption('arch'), $this->arch_c_flags);
+
+        // create pkgconfig and include dir (some libs cannot create them automatically)
+        f_mkdir(BUILD_LIB_PATH . '/pkgconfig', recursive: true);
+        f_mkdir(BUILD_INCLUDE_PATH, recursive: true);
+    }
+
+    /**
+     * Just start to build statically linked php binary
+     *
+     * @param  int                 $build_target build target
+     * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
+     */
+    public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
+    {
+        // ---------- Update extra-libs ----------
+        $extra_libs = $this->getOption('extra-libs', '');
+        // add libc++, some extensions or libraries need it (C++ cannot be linked statically)
+        $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCpp() ? '-lc++ ' : '');
+        if (!$this->getOption('bloat', false)) {
+            $extra_libs .= (empty($extra_libs) ? '' : ' ') . implode(' ', $this->getAllStaticLibFiles());
+        } else {
+            logger()->info('bloat linking');
+            $extra_libs .= (empty($extra_libs) ? '' : ' ') . implode(' ', array_map(fn ($x) => "-Wl,-force_load,{$x}", array_filter($this->getAllStaticLibFiles())));
+        }
+        $this->setOption('extra-libs', $extra_libs);
+
+        SourcePatcher::patchBeforeBuildconf($this);
+
+        shell()->cd(SOURCE_PATH . '/php-src')->exec('./buildconf --force');
+
+        SourcePatcher::patchBeforeConfigure($this);
+
+        $json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
+        $zts = $this->getOption('enable-zts', false) ? '--enable-zts --disable-zend-signals ' : '';
+
+        $enableCli = ($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI;
+        $enableFpm = ($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM;
+        $enableMicro = ($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO;
+        $enableEmbed = ($build_target & BUILD_TARGET_EMBED) === BUILD_TARGET_EMBED;
+
+        shell()->cd(SOURCE_PATH . '/php-src')
+            ->exec(
+                './configure ' .
+                '--prefix= ' .
+                '--with-valgrind=no ' .     // Not detect memory leak
+                '--enable-shared=no ' .
+                '--enable-static=yes ' .
+                "CFLAGS='{$this->arch_c_flags} -Werror=unknown-warning-option' " .
+                '--disable-all ' .
+                '--disable-cgi ' .
+                '--disable-phpdbg ' .
+                ($enableCli ? '--enable-cli ' : '--disable-cli ') .
+                ($enableFpm ? '--enable-fpm ' : '--disable-fpm ') .
+                ($enableEmbed ? '--enable-embed=static ' : '--disable-embed ') .
+                ($enableMicro ? '--enable-micro ' : '--disable-micro ') .
+                $json_74 .
+                $zts .
+                $this->makeExtensionArgs()
+            );
+
+        SourcePatcher::patchBeforeMake($this);
+
+        $this->cleanMake();
+
+        if ($enableCli) {
+            logger()->info('building cli');
+            $this->buildCli();
+        }
+        if ($enableFpm) {
+            logger()->info('building fpm');
+            $this->buildFpm();
+        }
+        if ($enableMicro) {
+            logger()->info('building micro');
+            $this->buildMicro();
+        }
+        if ($enableEmbed) {
+            logger()->info('building embed');
+            if ($enableMicro) {
+                FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
+            }
+            $this->buildEmbed();
+        }
+
+        if (php_uname('m') === $this->getOption('arch')) {
+            $this->sanityCheck($build_target);
+        }
+    }
+
+    /**
+     * Build cli sapi
+     *
+     * @throws RuntimeException
+     * @throws FileSystemException
+     */
+    public function buildCli(): void
+    {
+        $vars = SystemUtil::makeEnvVarString([
+            'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} /usr/lib/libm.a",
+        ]);
+
+        $shell = shell()->cd(SOURCE_PATH . '/php-src');
+        $shell->exec('sed -ie "s|//lib|/lib|g" Makefile');
+        $shell->exec("make -j{$this->concurrency} {$vars} cli");
+        if (!$this->getOption('no-strip', false)) {
+            $shell->exec('strip sapi/cli/php');
+        }
+        $this->deployBinary(BUILD_TARGET_CLI);
+    }
+
+    /**
+     * Build phpmicro sapi
+     *
+     * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
+     */
+    public function buildMicro(): void
+    {
+        if ($this->getPHPVersionID() < 80000) {
+            throw new WrongUsageException('phpmicro only support PHP >= 8.0!');
+        }
+        if ($this->getExt('phar')) {
+            $this->phar_patched = true;
+            SourcePatcher::patchMicro(['phar']);
+        }
+
+        $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
+        $vars = [
+            // with debug information, optimize for size, remove identifiers, patch fake cli for micro
+            'EXTRA_CFLAGS' => '-g -Os' . $enable_fake_cli,
+            // link resolv library (macOS needs it)
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} /usr/lib/libm.a",
+        ];
+        $vars = SystemUtil::makeEnvVarString($vars);
+
+        shell()->cd(SOURCE_PATH . '/php-src')
+            ->exec("make -j{$this->concurrency} {$vars} micro");
+
+        if (!$this->getOption('no-strip', false)) {
+            shell()->cd(SOURCE_PATH . '/php-src/sapi/micro')->exec('strip --strip-all micro.sfx');
+        }
+        $this->deployBinary(BUILD_TARGET_MICRO);
+
+        if ($this->phar_patched) {
+            SourcePatcher::patchMicro(['phar'], true);
+        }
+    }
+
+    /**
+     * Build fpm sapi
+     *
+     * @throws RuntimeException
+     * @throws FileSystemException
+     */
+    public function buildFpm(): void
+    {
+        $vars = SystemUtil::makeEnvVarString([
+            'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} /usr/lib/libm.a", // link resolv library (macOS needs it)
+        ]);
+
+        $shell = shell()->cd(SOURCE_PATH . '/php-src');
+        $shell->exec("make -j{$this->concurrency} {$vars} fpm");
+        if (!$this->getOption('no-strip', false)) {
+            $shell->exec('strip sapi/fpm/php-fpm');
+        }
+        $this->deployBinary(BUILD_TARGET_FPM);
+    }
+
+    /**
+     * Build embed sapi
+     *
+     * @throws RuntimeException
+     */
+    public function buildEmbed(): void
+    {
+        $vars = SystemUtil::makeEnvVarString([
+            'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} /usr/lib/libm.a", // link resolv library (macOS needs it)
+        ]);
+
+        shell()
+            ->cd(SOURCE_PATH . '/php-src')
+            ->exec('make INSTALL_ROOT=' . BUILD_ROOT_PATH . " -j{$this->concurrency} {$vars} install")
+            // Workaround for https://github.com/php/php-src/issues/12082
+            ->exec('rm -Rf ' . BUILD_ROOT_PATH . '/lib/php-o')
+            ->exec('mkdir ' . BUILD_ROOT_PATH . '/lib/php-o')
+            ->cd(BUILD_ROOT_PATH . '/lib/php-o')
+            ->exec('ar x ' . BUILD_ROOT_PATH . '/lib/libphp.a')
+            ->exec('rm ' . BUILD_ROOT_PATH . '/lib/libphp.a')
+            ->exec('ar rcs ' . BUILD_ROOT_PATH . '/lib/libphp.a *.o')
+            ->exec('rm -Rf ' . BUILD_ROOT_PATH . '/lib/php-o');
+    }
+}

src/SPC/builder/freebsd/SystemUtil.php

@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\freebsd;
+
+use SPC\builder\traits\UnixSystemUtilTrait;
+use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
+
+class SystemUtil
+{
+    /** Unix System Util Compatible */
+    use UnixSystemUtilTrait;
+
+    /**
+     * Get Logic CPU Count for macOS
+     *
+     * @throws RuntimeException
+     */
+    public static function getCpuCount(): int
+    {
+        [$ret, $output] = shell()->execWithResult('sysctl -n hw.ncpu');
+        if ($ret !== 0) {
+            throw new RuntimeException('Failed to get cpu count');
+        }
+
+        return (int) $output[0];
+    }
+
+    /**
+     * Get Target Arch CFlags
+     *
+     * @param  string              $arch Arch Name
+     * @return string              return Arch CFlags string
+     * @throws WrongUsageException
+     */
+    public static function getArchCFlags(string $arch): string
+    {
+        return match ($arch) {
+            'amd64', 'x86_64' => '--target=x86_64-unknown-freebsd',
+            'arm64','aarch64' => '--target=aarch-unknown-freebsd',
+            default => throw new WrongUsageException('unsupported arch: ' . $arch),
+        };
+    }
+}

src/SPC/builder/freebsd/library/BSDLibraryBase.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\freebsd\library;
+
+use SPC\builder\BuilderBase;
+use SPC\builder\freebsd\BSDBuilder;
+use SPC\builder\LibraryBase;
+use SPC\builder\traits\UnixLibraryTrait;
+
+abstract class BSDLibraryBase extends LibraryBase
+{
+    use UnixLibraryTrait;
+
+    protected array $headers;
+
+    public function __construct(protected BSDBuilder $builder)
+    {
+        parent::__construct();
+    }
+
+    public function getBuilder(): BuilderBase
+    {
+        return $this->builder;
+    }
+}

src/SPC/builder/freebsd/library/bzip2.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\freebsd\library;
+
+class bzip2 extends BSDLibraryBase
+{
+    use \SPC\builder\unix\library\bzip2;
+
+    public const NAME = 'bzip2';
+}

src/SPC/builder/freebsd/library/curl.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\freebsd\library;
+
+class curl extends BSDLibraryBase
+{
+    use \SPC\builder\unix\library\curl;
+
+    public const NAME = 'curl';
+
+    public function getStaticLibFiles(string $style = 'autoconf', bool $recursive = true): string
+    {
+        $libs = parent::getStaticLibFiles($style, $recursive);
+        if ($this->builder->getLib('openssl')) {
+            $this->builder->setOption('extra-libs', $this->builder->getOption('extra-libs') . ' /usr/lib/libpthread.a /usr/lib/libdl.a');
+        }
+        return $libs;
+    }
+}

src/SPC/builder/freebsd/library/onig.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\freebsd\library;
+
+class onig extends BSDLibraryBase
+{
+    use \SPC\builder\unix\library\onig;
+
+    public const NAME = 'onig';
+}

src/SPC/builder/freebsd/library/openssl.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright (c) 2022 Yun Dou <dixyes@gmail.com>
+ *
+ * lwmbs is licensed under Mulan PSL v2. You can use this
+ * software according to the terms and conditions of the
+ * Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at:
+ *
+ * http://license.coscl.org.cn/MulanPSL2
+ *
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
+ * WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ *
+ * See the Mulan PSL v2 for more details.
+ */
+
+declare(strict_types=1);
+
+namespace SPC\builder\freebsd\library;
+
+use SPC\builder\macos\library\MacOSLibraryBase;
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
+
+class openssl extends BSDLibraryBase
+{
+    public const NAME = 'openssl';
+
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
+     */
+    protected function build(): void
+    {
+        [$lib,,$destdir] = SEPARATED_PATH;
+
+        // lib:zlib
+        $extra = '';
+        $ex_lib = '';
+        $zlib = $this->builder->getLib('zlib');
+        if ($zlib instanceof MacOSLibraryBase) {
+            $extra = 'zlib';
+            $ex_lib = trim($zlib->getStaticLibFiles() . ' ' . $ex_lib);
+        }
+
+        shell()->cd($this->source_dir)
+            ->exec(
+                "./Configure no-shared {$extra} " .
+                '--prefix=/ ' . // use prefix=/
+                "--libdir={$lib} " .
+                '--openssldir=/etc/ssl ' .
+                'BSD-' . arch2gnu($this->builder->getOption('arch'))
+            )
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
+            ->exec("make install_sw DESTDIR={$destdir}");
+        $this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']);
+    }
+}

src/SPC/builder/freebsd/library/pkgconfig.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\freebsd\library;
+
+/**
+ * gmp is a template library class for unix
+ */
+class pkgconfig extends BSDLibraryBase
+{
+    use \SPC\builder\unix\library\pkgconfig;
+
+    public const NAME = 'pkg-config';
+}

src/SPC/builder/freebsd/library/zlib.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\freebsd\library;
+
+class zlib extends BSDLibraryBase
+{
+    use \SPC\builder\unix\library\zlib;
+
+    public const NAME = 'zlib';
+}

src/SPC/builder/linux/LinuxBuilder.php

@@ -10,6 +10,7 @@ use SPC\builder\traits\UnixBuilderTrait;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
 
 class LinuxBuilder extends BuilderBase
@@ -17,15 +18,9 @@ class LinuxBuilder extends BuilderBase
     /** Unix compatible builder methods */
     use UnixBuilderTrait;
 
-    /** @var string Using libc [musl,glibc] */
-    public string $libc;
-
     /** @var array Tune cflags */
     public array $tune_c_flags;
 
-    /** @var string pkg-config env, including PKG_CONFIG_PATH, PKG_CONFIG */
-    public string $pkgconf_env;
-
     /** @var bool Micro patch phar flag */
     private bool $phar_patched = false;
 
@@ -39,48 +34,55 @@ class LinuxBuilder extends BuilderBase
         $this->options = $options;
 
         // ---------- set necessary options ----------
-        // set C Compiler (default: alpine: gcc, others: musl-gcc)
-        $this->setOptionIfNotExist('cc', match (SystemUtil::getOSRelease()['dist']) {
-            'alpine' => 'gcc',
-            default => 'musl-gcc'
-        });
-        // set C++ Compiler (default: g++)
-        $this->setOptionIfNotExist('cxx', 'g++');
+        // set C/C++ compilers (default: alpine: gcc, others: musl-cross-make)
+        if (SystemUtil::isMuslDist()) {
+            f_putenv("CC={$this->getOption('cc', 'gcc')}");
+            f_putenv("CXX={$this->getOption('cxx', 'g++')}");
+            f_putenv("AR={$this->getOption('ar', 'ar')}");
+            f_putenv("LD={$this->getOption('ld', 'ld.gold')}");
+        } else {
+            $arch = arch2gnu(php_uname('m'));
+            f_putenv("CC={$this->getOption('cc', "{$arch}-linux-musl-gcc")}");
+            f_putenv("CXX={$this->getOption('cxx', "{$arch}-linux-musl-g++")}");
+            f_putenv("AR={$this->getOption('ar', "{$arch}-linux-musl-ar")}");
+            f_putenv("LD={$this->getOption('ld', 'ld.gold')}");
+            f_putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . BUILD_ROOT_PATH . '/bin:' . getenv('PATH'));
+
+            // set library path, some libraries need it. (We cannot use `putenv` here, because cmake will be confused)
+            $this->setOptionIfNotExist('library_path', "LIBRARY_PATH=/usr/local/musl/{$arch}-linux-musl/lib");
+            $this->setOptionIfNotExist('ld_library_path', "LD_LIBRARY_PATH=/usr/local/musl/{$arch}-linux-musl/lib");
+
+            // check musl-cross make installed if we use musl-cross-make
+            if (str_ends_with(getenv('CC'), 'linux-musl-gcc') && !file_exists("/usr/local/musl/bin/{$arch}-linux-musl-gcc")) {
+                throw new WrongUsageException('musl-cross-make not installed, please install it first. (You can use `doctor` command to install it)');
+            }
+        }
+
+        // set PKG_CONFIG
+        f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
+        // set PKG_CONFIG_PATH
+        f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
+
         // set arch (default: current)
         $this->setOptionIfNotExist('arch', php_uname('m'));
         $this->setOptionIfNotExist('gnu-arch', arch2gnu($this->getOption('arch')));
 
-        // ---------- set necessary compile environments ----------
-        // set libc
-        $this->libc = 'musl'; // SystemUtil::selectLibc($this->cc);
         // concurrency
         $this->concurrency = SystemUtil::getCpuCount();
         // cflags
-        $this->arch_c_flags = SystemUtil::getArchCFlags($this->getOption('cc'), $this->getOption('arch'));
-        $this->arch_cxx_flags = SystemUtil::getArchCFlags($this->getOption('cxx'), $this->getOption('arch'));
-        $this->tune_c_flags = SystemUtil::checkCCFlags(SystemUtil::getTuneCFlags($this->getOption('arch')), $this->getOption('cc'));
+        $this->arch_c_flags = SystemUtil::getArchCFlags(getenv('CC'), $this->getOption('arch'));
+        $this->arch_cxx_flags = SystemUtil::getArchCFlags(getenv('CXX'), $this->getOption('arch'));
+        $this->tune_c_flags = SystemUtil::checkCCFlags(SystemUtil::getTuneCFlags($this->getOption('arch')), getenv('CC'));
         // cmake toolchain
         $this->cmake_toolchain_file = SystemUtil::makeCmakeToolchainFile(
             'Linux',
             $this->getOption('arch'),
             $this->arch_c_flags,
-            $this->getOption('cc'),
-            $this->getOption('cxx'),
+            getenv('CC'),
+            getenv('CXX'),
         );
-        // pkg-config
-        $vars = [
-            'PKG_CONFIG' => BUILD_ROOT_PATH . '/bin/pkg-config',
-            'PKG_CONFIG_PATH' => BUILD_LIB_PATH . '/pkgconfig',
-        ];
-        $this->pkgconf_env = SystemUtil::makeEnvVarString($vars);
-        // configure environment
-        $this->configure_env = SystemUtil::makeEnvVarString([
-            ...$vars,
-            'CC' => $this->getOption('cc'),
-            'CXX' => $this->getOption('cxx'),
-            'PATH' => BUILD_ROOT_PATH . '/bin:' . getenv('PATH'),
-        ]);
-        // cross-compile does not support yet
+
+        // cross-compiling is not supported yet
         /*if (php_uname('m') !== $this->arch) {
             $this->cross_compile_prefix = SystemUtil::getCrossCompilePrefix($this->cc, $this->arch);
             logger()->info('using cross compile prefix: ' . $this->cross_compile_prefix);
@@ -133,33 +135,16 @@ class LinuxBuilder extends BuilderBase
         } else {
             $extra_libs .= (empty($extra_libs) ? '' : ' ') . implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", array_filter($this->getAllStaticLibFiles())));
         }
-        // add libstdc++, some extensions or libraries need it (C++ cannot be linked statically)
-        $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCppExtension() ? '-lstdc++ ' : '');
+        // add libstdc++, some extensions or libraries need it
+        $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCpp() ? '-lstdc++ ' : '');
         $this->setOption('extra-libs', $extra_libs);
 
         $cflags = $this->arch_c_flags;
-        $use_lld = '';
 
-        switch ($this->libc) {
-            case 'musl_wrapper':
-            case 'glibc':
-                $cflags .= ' -static-libgcc -I"' . BUILD_INCLUDE_PATH . '"';
-                break;
-            case 'musl':
-                if (str_ends_with($this->getOption('cc'), 'clang') && SystemUtil::findCommand('lld')) {
-                    $use_lld = '-Xcompiler -fuse-ld=lld';
-                }
-                break;
-            default:
-                throw new WrongUsageException('libc ' . $this->libc . ' is not implemented yet');
-        }
-
-        $envs = $this->pkgconf_env . ' ' . SystemUtil::makeEnvVarString([
-            'CC' => $this->getOption('cc'),
-            'CXX' => $this->getOption('cxx'),
+        // prepare build php envs
+        $envs_build_php = SystemUtil::makeEnvVarString([
             'CFLAGS' => $cflags,
             'LIBS' => '-ldl -lpthread',
-            'PATH' => BUILD_ROOT_PATH . '/bin:' . getenv('PATH'),
         ]);
 
         SourcePatcher::patchBeforeBuildconf($this);
@@ -178,9 +163,16 @@ class LinuxBuilder extends BuilderBase
             $maxExecutionTimers = '';
             $zts = '';
         }
+        $disable_jit = $this->getOption('disable-opcache-jit', false) ? '--disable-opcache-jit ' : '';
+
+        $enableCli = ($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI;
+        $enableFpm = ($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM;
+        $enableMicro = ($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO;
+        $enableEmbed = ($build_target & BUILD_TARGET_EMBED) === BUILD_TARGET_EMBED;
 
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec(
+                "{$this->getOption('ld_library_path')} " .
                 './configure ' .
                 '--prefix= ' .
                 '--with-valgrind=no ' .
@@ -189,40 +181,45 @@ class LinuxBuilder extends BuilderBase
                 '--disable-all ' .
                 '--disable-cgi ' .
                 '--disable-phpdbg ' .
-                '--enable-cli ' .
-                '--enable-fpm ' .
+                ($enableCli ? '--enable-cli ' : '--disable-cli ') .
+                ($enableFpm ? '--enable-fpm ' : '--disable-fpm ') .
+                ($enableEmbed ? '--enable-embed=static ' : '--disable-embed ') .
+                ($enableMicro ? '--enable-micro=all-static ' : '--disable-micro ') .
+                $disable_jit .
                 $json_74 .
                 $zts .
                 $maxExecutionTimers .
-                '--enable-micro=all-static ' .
                 $this->makeExtensionArgs() . ' ' .
-                $envs
+                $envs_build_php
             );
 
         SourcePatcher::patchBeforeMake($this);
 
         $this->cleanMake();
 
-        if (($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI) {
+        if ($enableCli) {
             logger()->info('building cli');
-            $this->buildCli($extra_libs, $use_lld);
+            $this->buildCli();
         }
-        if (($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM) {
+        if ($enableFpm) {
             logger()->info('building fpm');
-            $this->buildFpm($extra_libs, $use_lld);
+            $this->buildFpm();
         }
-        if (($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO) {
+        if ($enableMicro) {
             logger()->info('building micro');
-            $this->buildMicro($extra_libs, $use_lld, $cflags);
+            $this->buildMicro();
+        }
+        if ($enableEmbed) {
+            logger()->info('building embed');
+            if ($enableMicro) {
+                FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
+            }
+            $this->buildEmbed();
         }
 
         if (php_uname('m') === $this->getOption('arch')) {
             $this->sanityCheck($build_target);
         }
-
-        if ($this->phar_patched) {
-            SourcePatcher::patchMicro(['phar'], true);
-        }
     }
 
     /**
@@ -231,13 +228,9 @@ class LinuxBuilder extends BuilderBase
      * @throws RuntimeException
      * @throws FileSystemException
      */
-    public function buildCli(string $extra_libs, string $use_lld): void
+    public function buildCli(): void
     {
-        $vars = SystemUtil::makeEnvVarString([
-            'EXTRA_CFLAGS' => '-g -Os -fno-ident ' . implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", $this->tune_c_flags)),
-            'EXTRA_LIBS' => $extra_libs,
-            'EXTRA_LDFLAGS_PROGRAM' => "{$use_lld} -all-static",
-        ]);
+        $vars = SystemUtil::makeEnvVarString($this->getBuildVars());
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
             ->exec("make -j{$this->concurrency} {$vars} cli");
@@ -252,25 +245,23 @@ class LinuxBuilder extends BuilderBase
     /**
      * Build phpmicro sapi
      *
-     * @throws RuntimeException
      * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
      */
-    public function buildMicro(string $extra_libs, string $use_lld, string $cflags): void
+    public function buildMicro(): void
     {
         if ($this->getPHPVersionID() < 80000) {
-            throw new RuntimeException('phpmicro only support PHP >= 8.0!');
+            throw new WrongUsageException('phpmicro only support PHP >= 8.0!');
         }
         if ($this->getExt('phar')) {
             $this->phar_patched = true;
             SourcePatcher::patchMicro(['phar']);
         }
 
-        $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
-        $vars = SystemUtil::makeEnvVarString([
-            'EXTRA_CFLAGS' => '-g -Os -fno-ident ' . implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", $this->tune_c_flags)) . $enable_fake_cli,
-            'EXTRA_LIBS' => $extra_libs,
-            'EXTRA_LDFLAGS_PROGRAM' => "{$cflags} {$use_lld} -all-static",
-        ]);
+        $vars = SystemUtil::makeEnvVarString($this->getBuildVars([
+            'EXTRA_CFLAGS' => $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '',
+        ]));
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
             ->exec("make -j{$this->concurrency} {$vars} micro");
@@ -280,6 +271,10 @@ class LinuxBuilder extends BuilderBase
         }
 
         $this->deployBinary(BUILD_TARGET_MICRO);
+
+        if ($this->phar_patched) {
+            SourcePatcher::patchMicro(['phar'], true);
+        }
     }
 
     /**
@@ -288,14 +283,9 @@ class LinuxBuilder extends BuilderBase
      * @throws FileSystemException
      * @throws RuntimeException
      */
-    public function buildFpm(string $extra_libs, string $use_lld): void
+    public function buildFpm(): void
     {
-        $vars = SystemUtil::makeEnvVarString([
-            'EXTRA_CFLAGS' => '-g -Os -fno-ident ' . implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", $this->tune_c_flags)),
-            'EXTRA_LIBS' => $extra_libs,
-            'EXTRA_LDFLAGS_PROGRAM' => "{$use_lld} -all-static",
-        ]);
-
+        $vars = SystemUtil::makeEnvVarString($this->getBuildVars());
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec('sed -i "s|//lib|/lib|g" Makefile')
             ->exec("make -j{$this->concurrency} {$vars} fpm");
@@ -306,4 +296,36 @@ class LinuxBuilder extends BuilderBase
 
         $this->deployBinary(BUILD_TARGET_FPM);
     }
+
+    /**
+     * Build embed sapi
+     *
+     * @throws RuntimeException
+     */
+    public function buildEmbed(): void
+    {
+        $vars = SystemUtil::makeEnvVarString($this->getBuildVars());
+
+        shell()
+            ->cd(SOURCE_PATH . '/php-src')
+            ->exec('sed -i "s|//lib|/lib|g" Makefile')
+            ->exec('make INSTALL_ROOT=' . BUILD_ROOT_PATH . " -j{$this->concurrency} {$vars} install");
+    }
+
+    private function getBuildVars($input = []): array
+    {
+        $use_lld = '';
+        if (str_ends_with(getenv('CC'), 'clang') && SystemUtil::findCommand('lld')) {
+            $use_lld = '-Xcompiler -fuse-ld=lld';
+        }
+        $optimization = $this->getOption('no-strip', false) ? '-g -O0' : '-g0 -Os';
+        $cflags = isset($input['EXTRA_CFLAGS']) && $input['EXTRA_CFLAGS'] ? " {$input['EXTRA_CFLAGS']}" : '';
+        $libs = isset($input['EXTRA_LIBS']) && $input['EXTRA_LIBS'] ? " {$input['EXTRA_LIBS']}" : '';
+        $ldflags = isset($input['EXTRA_LDFLAGS_PROGRAM']) && $input['EXTRA_LDFLAGS_PROGRAM'] ? " {$input['EXTRA_LDFLAGS_PROGRAM']}" : '';
+        return [
+            'EXTRA_CFLAGS' => "{$optimization} -fno-ident -fPIE " . implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", $this->tune_c_flags)) . $cflags,
+            'EXTRA_LIBS' => $this->getOption('extra-libs', '') . $libs,
+            'EXTRA_LDFLAGS_PROGRAM' => "{$use_lld} -all-static" . $ldflags,
+        ];
+    }
 }

src/SPC/builder/linux/SystemUtil.php

@@ -20,6 +20,19 @@ class SystemUtil
             'ver' => 'unknown',
         ];
         switch (true) {
+            case file_exists('/etc/centos-release'):
+                $lines = file('/etc/centos-release');
+                goto rh;
+            case file_exists('/etc/redhat-release'):
+                $lines = file('/etc/redhat-release');
+                rh:
+                foreach ($lines as $line) {
+                    if (preg_match('/release\s+(\d*(\.\d+)*)/', $line, $matches)) {
+                        $ret['dist'] = 'redhat';
+                        $ret['ver'] = $matches[1];
+                    }
+                }
+                break;
             case file_exists('/etc/os-release'):
                 $lines = file('/etc/os-release');
                 foreach ($lines as $line) {
@@ -36,23 +49,15 @@ class SystemUtil
                     $ret['dist'] = 'redhat';
                 }
                 break;
-            case file_exists('/etc/centos-release'):
-                $lines = file('/etc/centos-release');
-                goto rh;
-            case file_exists('/etc/redhat-release'):
-                $lines = file('/etc/redhat-release');
-                rh:
-                foreach ($lines as $line) {
-                    if (preg_match('/release\s+(\d+(\.\d+)*)/', $line, $matches)) {
-                        $ret['dist'] = 'redhat';
-                        $ret['ver'] = $matches[1];
-                    }
-                }
-                break;
         }
         return $ret;
     }
 
+    public static function isMuslDist(): bool
+    {
+        return static::getOSRelease()['dist'] === 'alpine';
+    }
+
     public static function getCpuCount(): int
     {
         $ncpu = 1;
@@ -121,7 +126,7 @@ class SystemUtil
 
     public static function checkCCFlag(string $flag, string $cc): string
     {
-        [$ret] = shell()->execWithResult("echo | {$cc} -E -x c - {$flag}");
+        [$ret] = shell()->execWithResult("echo | {$cc} -E -x c - {$flag} 2>/dev/null");
         if ($ret != 0) {
             return '';
         }

src/SPC/builder/linux/library/LinuxLibraryBase.php

@@ -8,9 +8,6 @@ use SPC\builder\BuilderBase;
 use SPC\builder\LibraryBase;
 use SPC\builder\linux\LinuxBuilder;
 use SPC\builder\traits\UnixLibraryTrait;
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\exception\WrongUsageException;
 
 abstract class LinuxLibraryBase extends LibraryBase
 {
@@ -36,53 +33,4 @@ abstract class LinuxLibraryBase extends LibraryBase
     {
         return $this->builder;
     }
-
-    /**
-     * @throws RuntimeException
-     * @throws FileSystemException
-     * @throws WrongUsageException
-     */
-    public function tryBuild(bool $force_build = false): int
-    {
-        // 传入 true，表明直接编译
-        if ($force_build) {
-            logger()->info('Building required library [' . static::NAME . ']');
-            $this->patchBeforeBuild();
-            $this->build();
-            return BUILD_STATUS_OK;
-        }
-
-        // 看看这些库是不是存在，如果不存在，则调用编译并返回结果状态
-        foreach ($this->getStaticLibs() as $name) {
-            if (!file_exists(BUILD_LIB_PATH . "/{$name}")) {
-                $this->tryBuild(true);
-                return BUILD_STATUS_OK;
-            }
-        }
-        // 头文件同理
-        foreach ($this->getHeaders() as $name) {
-            if (!file_exists(BUILD_INCLUDE_PATH . "/{$name}")) {
-                $this->tryBuild(true);
-                return BUILD_STATUS_OK;
-            }
-        }
-        // pkg-config 做特殊处理，如果是 pkg-config 就检查有没有 pkg-config 二进制
-        if (static::NAME === 'pkg-config' && !file_exists(BUILD_ROOT_PATH . '/bin/pkg-config')) {
-            $this->tryBuild(true);
-            return BUILD_STATUS_OK;
-        }
-        // 到这里说明所有的文件都存在，就跳过编译
-        return BUILD_STATUS_ALREADY;
-    }
-
-    protected function makeFakePkgconfs(): void
-    {
-        $workspace = BUILD_ROOT_PATH;
-        if ($workspace === '/') {
-            $workspace = '';
-        }
-        foreach ($this->pkgconfs as $name => $content) {
-            file_put_contents(BUILD_LIB_PATH . "/pkgconfig/{$name}", "prefix={$workspace}\n" . $content);
-        }
-    }
 }

src/SPC/builder/linux/library/icu.php

@@ -10,11 +10,13 @@ class icu extends LinuxLibraryBase
 
     protected function build(): void
     {
-        $root = BUILD_ROOT_PATH;
-        $cppflag = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1  -DU_STATIC_IMPLEMENTATION=1"';
+        $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1  -DU_STATIC_IMPLEMENTATION=1"';
+        $cxxflags = 'CXXFLAGS="-std=c++11"';
+        $ldflags = 'LDFLAGS="-static"';
         shell()->cd($this->source_dir . '/source')
             ->exec(
-                "{$this->builder->configure_env} {$cppflag} ./runConfigureICU Linux " .
+                "{$cppflags} {$cxxflags} {$ldflags} " .
+                './runConfigureICU Linux ' .
                 '--enable-static ' .
                 '--disable-shared ' .
                 '--with-data-packaging=static ' .
@@ -25,7 +27,7 @@ class icu extends LinuxLibraryBase
                 '--enable-tools=yes ' .
                 '--enable-tests=no ' .
                 '--enable-samples=no ' .
-                "--prefix={$root}"
+                '--prefix=' . BUILD_ROOT_PATH
             )
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency}")

src/SPC/builder/linux/library/imap.php

@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
+
+class imap extends LinuxLibraryBase
+{
+    public const NAME = 'imap';
+
+    /**
+     * @throws FileSystemException
+     */
+    public function patchBeforeBuild(): bool
+    {
+        $cc = getenv('CC') ?: 'gcc';
+        // FileSystem::replaceFileStr($this->source_dir . '/Makefile', '-DMAC_OSX_KLUDGE=1', '');
+        FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', 'CC=cc', "CC={$cc}");
+        /* FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', '-lcrypto -lz', '-lcrypto');
+        FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', '-lcrypto', '-lcrypto -lz');
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/src/osdep/unix/ssl_unix.c',
+            "#include <x509v3.h>\n#include <ssl.h>",
+            "#include <ssl.h>\n#include <x509v3.h>"
+        );
+        // SourcePatcher::patchFile('1006_openssl1.1_autoverify.patch', $this->source_dir);
+        SourcePatcher::patchFile('2014_openssl1.1.1_sni.patch', $this->source_dir); */
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'SSLINCLUDE=/usr/include/openssl', 'SSLINCLUDE=' . BUILD_INCLUDE_PATH);
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'SSLLIB=/usr/lib', 'SSLLIB=' . BUILD_LIB_PATH);
+        return true;
+    }
+
+    /**
+     * @throws RuntimeException
+     */
+    protected function build(): void
+    {
+        if ($this->builder->getLib('openssl')) {
+            $ssl_options = 'SPECIALAUTHENTICATORS=ssl SSLTYPE=unix.nopwd SSLINCLUDE=' . BUILD_INCLUDE_PATH . ' SSLLIB=' . BUILD_LIB_PATH;
+        } else {
+            $ssl_options = 'SSLTYPE=none';
+        }
+        shell()->cd($this->source_dir)
+            ->exec('make clean')
+            ->exec('touch ip6')
+            ->exec(
+                "yes | make slx {$ssl_options}"
+            );
+        try {
+            shell()
+                ->exec("cp -rf {$this->source_dir}/c-client/c-client.a " . BUILD_LIB_PATH . '/libc-client.a')
+                ->exec("cp -rf {$this->source_dir}/c-client/*.c " . BUILD_LIB_PATH . '/')
+                ->exec("cp -rf {$this->source_dir}/c-client/*.h " . BUILD_INCLUDE_PATH . '/')
+                ->exec("cp -rf {$this->source_dir}/src/osdep/unix/*.h " . BUILD_INCLUDE_PATH . '/');
+        } catch (\Throwable) {
+            // last command throws an exception, no idea why since it works
+        }
+    }
+}

src/SPC/builder/linux/library/ldap.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class ldap extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\ldap;
+
+    public const NAME = 'ldap';
+}

src/SPC/builder/linux/library/libffi.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+use SPC\exception\RuntimeException;
+
+class libffi extends LinuxLibraryBase
+{
+    public const NAME = 'libffi';
+
+    /**
+     * @throws RuntimeException
+     */
+    public function build(): void
+    {
+        [$lib, , $destdir] = SEPARATED_PATH;
+
+        /*$env = $this->builder->pkgconf_env . ' CFLAGS="' . $this->builder->arch_c_flags . '"';
+
+        $env .= match ($this->builder->libc) {
+            'musl_wrapper' => " CC='{$this->builder->getOption('cc')} --static -idirafter " . BUILD_INCLUDE_PATH .
+                ($this->builder->getOption('arch') === php_uname('m') ? '-idirafter /usr/include/ ' : '') .
+                "-idirafter /usr/include/{$this->builder->getOption('arch')}-linux-gnu/'",
+            'musl', 'glibc' => " CC='{$this->builder->getOption('cc')}'",
+            default => throw new RuntimeException('unsupported libc: ' . $this->builder->libc),
+        };*/
+
+        shell()->cd($this->source_dir)
+            ->exec(
+                './configure ' .
+                '--enable-static ' .
+                '--disable-shared ' .
+                "--host={$this->builder->getOption('arch')}-unknown-linux " .
+                "--target={$this->builder->getOption('arch')}-unknown-linux " .
+                '--prefix= ' . // use prefix=/
+                "--libdir={$lib}"
+            )
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec("make install DESTDIR={$destdir}");
+
+        if (is_file(BUILD_ROOT_PATH . '/lib64/libffi.a')) {
+            copy(BUILD_ROOT_PATH . '/lib64/libffi.a', BUILD_ROOT_PATH . '/lib/libffi.a');
+            unlink(BUILD_ROOT_PATH . '/lib64/libffi.a');
+        }
+        $this->patchPkgconfPrefix(['libffi.pc']);
+    }
+}

src/SPC/builder/linux/library/libpng.php

@@ -20,36 +20,14 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
-use SPC\builder\linux\SystemUtil;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
-use SPC\store\FileSystem;
 
 class libpng extends LinuxLibraryBase
 {
     public const NAME = 'libpng';
 
-    /**
-     * @throws FileSystemException
-     */
-    public function patchBeforeBuild(): bool
-    {
-        FileSystem::replaceFileStr(
-            SOURCE_PATH . '/libpng/configure',
-            '-lz',
-            BUILD_LIB_PATH . '/libz.a'
-        );
-        if (SystemUtil::getOSRelease()['dist'] === 'alpine') {
-            FileSystem::replaceFileStr(
-                SOURCE_PATH . '/libpng/configure',
-                '-lm',
-                '/usr/lib/libm.a'
-            );
-        }
-        return true;
-    }
-
     /**
      * @throws FileSystemException
      * @throws RuntimeException
@@ -66,8 +44,8 @@ class libpng extends LinuxLibraryBase
             ->exec('chmod +x ./configure')
             ->exec('chmod +x ./install-sh')
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
-                "--host={$this->builder->getOption('gnu-arch')}-unknown-linux " .
+                'LDFLAGS="-L' . BUILD_LIB_PATH . '" ' .
+                './configure ' .
                 '--disable-shared ' .
                 '--enable-static ' .
                 '--enable-hardware-optimizations ' .
@@ -76,10 +54,8 @@ class libpng extends LinuxLibraryBase
                 '--prefix='
             )
             ->exec('make clean')
-            ->exec("make -j{$this->builder->concurrency} DEFAULT_INCLUDES='-I. -I" . BUILD_INCLUDE_PATH . "' LIBS= libpng16.la")
-            ->exec('make install-libLTLIBRARIES install-data-am DESTDIR=' . BUILD_ROOT_PATH)
-            ->cd(BUILD_LIB_PATH)
-            ->exec('ln -sf libpng16.a libpng.a');
+            ->exec("make -j{$this->builder->concurrency} DEFAULT_INCLUDES='-I{$this->source_dir} -I" . BUILD_INCLUDE_PATH . "' LIBS= libpng16.la")
+            ->exec('make install-libLTLIBRARIES install-data-am DESTDIR=' . BUILD_ROOT_PATH);
         $this->patchPkgconfPrefix(['libpng16.pc'], PKGCONF_PATCH_PREFIX);
         $this->cleanLaFiles();
     }

src/SPC/builder/linux/library/libxml2.php

@@ -19,22 +19,19 @@ class libxml2 extends LinuxLibraryBase
     public function build(): void
     {
         $enable_zlib = $this->builder->getLib('zlib') ? 'ON' : 'OFF';
-        // $enable_icu = $this->builder->getLib('icu') ? 'ON' : 'OFF';
+        $enable_icu = $this->builder->getLib('icu') ? 'ON' : 'OFF';
         $enable_xz = $this->builder->getLib('xz') ? 'ON' : 'OFF';
 
         FileSystem::resetDir($this->source_dir . '/build');
         shell()->cd($this->source_dir . '/build')
             ->exec(
-                "{$this->builder->configure_env} " . ' cmake ' .
-                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
-                '-DCMAKE_BUILD_TYPE=Release ' .
-                '-DCMAKE_INSTALL_PREFIX=' . escapeshellarg(BUILD_ROOT_PATH) . ' ' .
+                'cmake ' .
+                "{$this->builder->makeCmakeArgs()} " .
                 '-DBUILD_SHARED_LIBS=OFF ' .
-                '-DCMAKE_INSTALL_BINDIR=' . escapeshellarg(BUILD_ROOT_PATH . '/bin') . ' ' .
-                '-DLIBXML2_WITH_ICONV=ON ' .
                 '-DIconv_IS_BUILT_IN=OFF ' .
+                '-DLIBXML2_WITH_ICONV=ON ' .
                 "-DLIBXML2_WITH_ZLIB={$enable_zlib} " .
-                '-DLIBXML2_WITH_ICU=OFF ' .
+                "-DLIBXML2_WITH_ICU={$enable_icu} " .
                 "-DLIBXML2_WITH_LZMA={$enable_xz} " .
                 '-DLIBXML2_WITH_PYTHON=OFF ' .
                 '-DLIBXML2_WITH_PROGRAMS=OFF ' .
@@ -42,6 +39,12 @@ class libxml2 extends LinuxLibraryBase
                 '..'
             )
             ->exec("cmake --build . -j {$this->builder->concurrency}")
-            ->exec('make install');
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+
+        FileSystem::replaceFileStr(
+            BUILD_LIB_PATH . '/pkgconfig/libxml-2.0.pc',
+            '-licudata -licui18n -licuuc',
+            '-licui18n -licuuc -licudata'
+        );
     }
 }

src/SPC/builder/linux/library/nghttp2.php

@@ -55,7 +55,7 @@ class nghttp2 extends LinuxLibraryBase
 
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
                 "--host={$this->builder->getOption('gnu-arch')}-unknown-linux " .

src/SPC/builder/linux/library/openssl.php

@@ -41,8 +41,8 @@ class openssl extends LinuxLibraryBase
         $extra = '';
         $ex_lib = '-ldl -pthread';
 
-        $env = $this->builder->pkgconf_env . " CFLAGS='{$this->builder->arch_c_flags}'";
-        $env .= " CC='{$this->builder->getOption('cc')} -static -idirafter " . BUILD_INCLUDE_PATH .
+        $env = "CFLAGS='{$this->builder->arch_c_flags}'";
+        $env .= " CC='" . getenv('CC') . ' -static -idirafter ' . BUILD_INCLUDE_PATH .
             ' -idirafter /usr/include/ ' .
             ' -idirafter /usr/include/' . $this->builder->getOption('arch') . '-linux-gnu/ ' .
             "' ";
@@ -60,11 +60,11 @@ class openssl extends LinuxLibraryBase
 
         $ex_lib = trim($ex_lib);
 
-        $clang_postfix = SystemUtil::getCCType($this->builder->getOption('cc')) === 'clang' ? '-clang' : '';
+        $clang_postfix = SystemUtil::getCCType(getenv('CC')) === 'clang' ? '-clang' : '';
 
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} {$env} ./Configure no-shared {$extra} " .
+                "{$env} ./Configure no-shared {$extra} " .
                 '--prefix=/ ' .
                 '--libdir=lib ' .
                 '-static ' .

src/SPC/builder/linux/library/tidy.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class tidy extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\tidy;
+
+    public const NAME = 'tidy';
+}

src/SPC/builder/macos/MacOSBuilder.php

@@ -10,6 +10,7 @@ use SPC\builder\traits\UnixBuilderTrait;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
 use SPC\store\SourcePatcher;
 
 class MacOSBuilder extends BuilderBase
@@ -31,9 +32,16 @@ class MacOSBuilder extends BuilderBase
 
         // ---------- set necessary options ----------
         // set C Compiler (default: clang)
-        $this->setOptionIfNotExist('cc', 'clang');
+        f_putenv('CC=' . $this->getOption('cc', 'clang'));
         // set C++ Composer (default: clang++)
-        $this->setOptionIfNotExist('cxx', 'clang++');
+        f_putenv('CXX=' . $this->getOption('cxx', 'clang++'));
+        // set PATH
+        f_putenv('PATH=' . BUILD_ROOT_PATH . '/bin:' . getenv('PATH'));
+        // set PKG_CONFIG
+        f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
+        // set PKG_CONFIG_PATH
+        f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig/');
+
         // set arch (default: current)
         $this->setOptionIfNotExist('arch', php_uname('m'));
         $this->setOptionIfNotExist('gnu-arch', arch2gnu($this->getOption('arch')));
@@ -46,15 +54,6 @@ class MacOSBuilder extends BuilderBase
         $this->arch_cxx_flags = SystemUtil::getArchCFlags($this->getOption('arch'));
         // cmake toolchain
         $this->cmake_toolchain_file = SystemUtil::makeCmakeToolchainFile('Darwin', $this->getOption('arch'), $this->arch_c_flags);
-        // configure environment
-        $this->configure_env = SystemUtil::makeEnvVarString([
-            'PKG_CONFIG' => BUILD_ROOT_PATH . '/bin/pkg-config',
-            'PKG_CONFIG_PATH' => BUILD_LIB_PATH . '/pkgconfig/',
-            'CC' => $this->getOption('cc'),
-            'CXX' => $this->getOption('cxx'),
-            'CFLAGS' => "{$this->arch_c_flags} -Wimplicit-function-declaration -Os",
-            'PATH' => BUILD_ROOT_PATH . '/bin:' . getenv('PATH'),
-        ]);
 
         // create pkgconfig and include dir (some libs cannot create them automatically)
         f_mkdir(BUILD_LIB_PATH . '/pkgconfig', recursive: true);
@@ -133,7 +132,7 @@ class MacOSBuilder extends BuilderBase
         // add macOS frameworks
         $extra_libs .= (empty($extra_libs) ? '' : ' ') . $this->getFrameworks(true);
         // add libc++, some extensions or libraries need it (C++ cannot be linked statically)
-        $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCppExtension() ? '-lc++ ' : '');
+        $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCpp() ? '-lc++ ' : '');
         if (!$this->getOption('bloat', false)) {
             $extra_libs .= (empty($extra_libs) ? '' : ' ') . implode(' ', $this->getAllStaticLibFiles());
         } else {
@@ -151,6 +150,11 @@ class MacOSBuilder extends BuilderBase
         $json_74 = $this->getPHPVersionID() < 80000 ? '--enable-json ' : '';
         $zts = $this->getOption('enable-zts', false) ? '--enable-zts --disable-zend-signals ' : '';
 
+        $enableCli = ($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI;
+        $enableFpm = ($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM;
+        $enableMicro = ($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO;
+        $enableEmbed = ($build_target & BUILD_TARGET_EMBED) === BUILD_TARGET_EMBED;
+
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec(
                 './configure ' .
@@ -162,39 +166,42 @@ class MacOSBuilder extends BuilderBase
                 '--disable-all ' .
                 '--disable-cgi ' .
                 '--disable-phpdbg ' .
-                '--enable-cli ' .
-                '--enable-fpm ' .
-                '--enable-micro ' .
+                ($enableCli ? '--enable-cli ' : '--disable-cli ') .
+                ($enableFpm ? '--enable-fpm ' : '--disable-fpm ') .
+                ($enableEmbed ? '--enable-embed=static ' : '--disable-embed ') .
+                ($enableMicro ? '--enable-micro ' : '--disable-micro ') .
                 $json_74 .
                 $zts .
-                $this->makeExtensionArgs() . ' ' .
-                $this->configure_env
+                $this->makeExtensionArgs()
             );
 
         SourcePatcher::patchBeforeMake($this);
 
         $this->cleanMake();
 
-        if (($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI) {
+        if ($enableCli) {
             logger()->info('building cli');
             $this->buildCli();
         }
-        if (($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM) {
+        if ($enableFpm) {
             logger()->info('building fpm');
             $this->buildFpm();
         }
-        if (($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO) {
+        if ($enableMicro) {
             logger()->info('building micro');
             $this->buildMicro();
         }
+        if ($enableEmbed) {
+            logger()->info('building embed');
+            if ($enableMicro) {
+                FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
+            }
+            $this->buildEmbed();
+        }
 
         if (php_uname('m') === $this->getOption('arch')) {
             $this->sanityCheck($build_target);
         }
-
-        if ($this->phar_patched) {
-            SourcePatcher::patchMicro(['phar'], true);
-        }
     }
 
     /**
@@ -207,7 +214,7 @@ class MacOSBuilder extends BuilderBase
     {
         $vars = SystemUtil::makeEnvVarString([
             'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
-            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv", // link resolv library (macOS need it)
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv", // link resolv library (macOS needs it)
         ]);
 
         $shell = shell()->cd(SOURCE_PATH . '/php-src');
@@ -221,12 +228,14 @@ class MacOSBuilder extends BuilderBase
     /**
      * Build phpmicro sapi
      *
-     * @throws FileSystemException|RuntimeException
+     * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
      */
     public function buildMicro(): void
     {
         if ($this->getPHPVersionID() < 80000) {
-            throw new RuntimeException('phpmicro only support PHP >= 8.0!');
+            throw new WrongUsageException('phpmicro only support PHP >= 8.0!');
         }
         if ($this->getExt('phar')) {
             $this->phar_patched = true;
@@ -237,7 +246,7 @@ class MacOSBuilder extends BuilderBase
         $vars = [
             // with debug information, optimize for size, remove identifiers, patch fake cli for micro
             'EXTRA_CFLAGS' => '-g -Os -fno-ident' . $enable_fake_cli,
-            // link resolv library (macOS need it)
+            // link resolv library (macOS needs it)
             'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv",
         ];
         if (!$this->getOption('no-strip', false)) {
@@ -248,6 +257,10 @@ class MacOSBuilder extends BuilderBase
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec("make -j{$this->concurrency} {$vars} micro");
         $this->deployBinary(BUILD_TARGET_MICRO);
+
+        if ($this->phar_patched) {
+            SourcePatcher::patchMicro(['phar'], true);
+        }
     }
 
     /**
@@ -260,7 +273,7 @@ class MacOSBuilder extends BuilderBase
     {
         $vars = SystemUtil::makeEnvVarString([
             'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
-            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv", // link resolv library (macOS need it)
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv", // link resolv library (macOS needs it)
         ]);
 
         $shell = shell()->cd(SOURCE_PATH . '/php-src');
@@ -270,4 +283,29 @@ class MacOSBuilder extends BuilderBase
         }
         $this->deployBinary(BUILD_TARGET_FPM);
     }
+
+    /**
+     * Build embed sapi
+     *
+     * @throws RuntimeException
+     */
+    public function buildEmbed(): void
+    {
+        $vars = SystemUtil::makeEnvVarString([
+            'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv", // link resolv library (macOS needs it)
+        ]);
+
+        shell()
+            ->cd(SOURCE_PATH . '/php-src')
+            ->exec('make INSTALL_ROOT=' . BUILD_ROOT_PATH . " -j{$this->concurrency} {$vars} install")
+            // Workaround for https://github.com/php/php-src/issues/12082
+            ->exec('rm -Rf ' . BUILD_ROOT_PATH . '/lib/php-o')
+            ->exec('mkdir ' . BUILD_ROOT_PATH . '/lib/php-o')
+            ->cd(BUILD_ROOT_PATH . '/lib/php-o')
+            ->exec('ar x ' . BUILD_ROOT_PATH . '/lib/libphp.a')
+            ->exec('rm ' . BUILD_ROOT_PATH . '/lib/libphp.a')
+            ->exec('ar rcs ' . BUILD_ROOT_PATH . '/lib/libphp.a *.o')
+            ->exec('rm -Rf ' . BUILD_ROOT_PATH . '/lib/php-o');
+    }
 }

src/SPC/builder/macos/library/curl.php

@@ -44,6 +44,11 @@ class curl extends MacOSLibraryBase
             '/NOT SYSTEMCONFIGURATION_FRAMEWORK/m',
             'FALSE'
         );
+        FileSystem::replaceFileRegex(
+            SOURCE_PATH . '/curl/CMakeLists.txt',
+            '/NOT CORESERVICES_FRAMEWORK/m',
+            'FALSE'
+        );
         return true;
     }
 }

src/SPC/builder/macos/library/glfw.php

@@ -19,7 +19,7 @@ class glfw extends MacOSLibraryBase
     {
         // compile！
         shell()->cd(SOURCE_PATH . '/ext-glfw/vendor/glfw')
-            ->exec("{$this->builder->configure_env} cmake . {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF")
+            ->exec("cmake . {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF")
             ->exec("make -j{$this->builder->concurrency}")
             ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
         // patch pkgconf

src/SPC/builder/macos/library/icu.php

@@ -12,7 +12,7 @@ class icu extends MacOSLibraryBase
     {
         $root = BUILD_ROOT_PATH;
         shell()->cd($this->source_dir . '/source')
-            ->exec("{$this->builder->configure_env} ./runConfigureICU MacOSX --enable-static --disable-shared --prefix={$root}")
+            ->exec("./runConfigureICU MacOSX --enable-static --disable-shared --prefix={$root}")
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency}")
             ->exec('make install');

src/SPC/builder/macos/library/imap.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
+use SPC\store\SourcePatcher;
+
+class imap extends MacOSLibraryBase
+{
+    public const NAME = 'imap';
+
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     */
+    public function patchBeforeBuild(): bool
+    {
+        $cc = getenv('CC') ?: 'clang';
+        SourcePatcher::patchFile('0001_imap_macos.patch', $this->source_dir);
+        // FileSystem::replaceFileStr($this->source_dir . '/Makefile', '-DMAC_OSX_KLUDGE=1', '');
+        FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', 'CC=cc', "CC={$cc}");
+        /* FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', '-lcrypto -lz', '-lcrypto');
+        FileSystem::replaceFileStr($this->source_dir . '/src/osdep/unix/Makefile', '-lcrypto', '-lcrypto -lz');
+        FileSystem::replaceFileStr(
+            $this->source_dir . '/src/osdep/unix/ssl_unix.c',
+            "#include <x509v3.h>\n#include <ssl.h>",
+            "#include <ssl.h>\n#include <x509v3.h>"
+        );
+        // SourcePatcher::patchFile('1006_openssl1.1_autoverify.patch', $this->source_dir);
+        SourcePatcher::patchFile('2014_openssl1.1.1_sni.patch', $this->source_dir); */
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'SSLINCLUDE=/usr/include/openssl', 'SSLINCLUDE=' . BUILD_INCLUDE_PATH);
+        FileSystem::replaceFileStr($this->source_dir . '/Makefile', 'SSLLIB=/usr/lib', 'SSLLIB=' . BUILD_LIB_PATH);
+        return true;
+    }
+
+    /**
+     * @throws RuntimeException
+     */
+    protected function build(): void
+    {
+        if ($this->builder->getLib('openssl')) {
+            $ssl_options = 'SPECIALAUTHENTICATORS=ssl SSLTYPE=unix.nopwd SSLINCLUDE=' . BUILD_INCLUDE_PATH . ' SSLLIB=' . BUILD_LIB_PATH;
+        } else {
+            $ssl_options = 'SSLTYPE=none';
+        }
+        shell()->cd($this->source_dir)
+            ->exec('make clean')
+            ->exec('touch ip6')
+            ->exec(
+                "yes | EXTRACFLAGS='-Wimplicit-function-declaration -include $(xcrun --show-sdk-path)/usr/include/poll.h -include $(xcrun --show-sdk-path)/usr/include/time.h -include $(xcrun --show-sdk-path)/usr/include/utime.h' make osx {$ssl_options}"
+            );
+        try {
+            shell()
+                ->exec("cp -rf {$this->source_dir}/c-client/c-client.a " . BUILD_LIB_PATH . '/libc-client.a')
+                ->exec("cp -rf {$this->source_dir}/c-client/*.c " . BUILD_LIB_PATH . '/')
+                ->exec("cp -rf {$this->source_dir}/c-client/*.h " . BUILD_INCLUDE_PATH . '/')
+                ->exec("cp -rf {$this->source_dir}/src/osdep/unix/*.h " . BUILD_INCLUDE_PATH . '/');
+        } catch (\Throwable) {
+            // last command throws an exception, no idea why since it works
+        }
+    }
+}

src/SPC/builder/macos/library/ldap.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class ldap extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\ldap;
+
+    public const NAME = 'ldap';
+}

src/SPC/builder/macos/library/libffi.php

@@ -20,7 +20,7 @@ class libffi extends MacOSLibraryBase
         [, , $destdir] = SEPARATED_PATH;
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
                 "--host={$this->builder->getOption('arch')}-apple-darwin " .

src/SPC/builder/macos/library/libmemcached.php

@@ -18,7 +18,7 @@ class libmemcached extends MacOSLibraryBase
         shell()->cd($this->source_dir)
             ->exec('chmod +x configure')
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                './configure ' .
                 '--enable-static --disable-shared ' .
                 '--disable-sasl ' .
                 "--prefix={$rootdir}"

src/SPC/builder/macos/library/libpng.php

@@ -44,7 +44,7 @@ class libpng extends MacOSLibraryBase
             ->exec('chmod +x ./configure')
             ->exec('chmod +x ./install-sh')
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                './configure ' .
                 "--host={$this->builder->getOption('gnu-arch')}-apple-darwin " .
                 '--disable-shared ' .
                 '--enable-static ' .

src/SPC/builder/macos/library/libxml2.php

@@ -18,38 +18,27 @@ class libxml2 extends MacOSLibraryBase
      */
     protected function build(): void
     {
-        // macOS need to link iconv dynamically, we add it to extra-libs
-        $extra_libs = $this->builder->getOption('extra-libs', '');
-        if (!str_contains($extra_libs, '-liconv')) {
-            $extra_libs .= ' -liconv';
-        }
-        $this->builder->setOption('extra-libs', $extra_libs);
-
         $enable_zlib = $this->builder->getLib('zlib') ? 'ON' : 'OFF';
-        // $enable_icu = $this->builder->getLib('icu') ? 'ON' : 'OFF';
+        $enable_icu = $this->builder->getLib('icu') ? 'ON' : 'OFF';
         $enable_xz = $this->builder->getLib('xz') ? 'ON' : 'OFF';
 
-        [, , $destdir] = SEPARATED_PATH;
-
         FileSystem::resetDir($this->source_dir . '/build');
         shell()->cd($this->source_dir . '/build')
             ->exec(
-                "{$this->builder->configure_env} " . ' cmake ' .
+                'cmake ' .
                 // '--debug-find ' .
-                '-DCMAKE_BUILD_TYPE=Release ' .
+                "{$this->builder->makeCmakeArgs()} " .
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DLIBXML2_WITH_ICONV=ON ' .
                 "-DLIBXML2_WITH_ZLIB={$enable_zlib} " .
-                '-DLIBXML2_WITH_ICU=OFF ' .
+                "-DLIBXML2_WITH_ICU={$enable_icu} " .
                 "-DLIBXML2_WITH_LZMA={$enable_xz} " .
                 '-DLIBXML2_WITH_PYTHON=OFF ' .
                 '-DLIBXML2_WITH_PROGRAMS=OFF ' .
                 '-DLIBXML2_WITH_TESTS=OFF ' .
-                "-DCMAKE_INSTALL_PREFIX={$destdir} " .
-                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
                 '..'
             )
             ->exec("cmake --build . -j {$this->builder->concurrency}")
-            ->exec('make install');
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
     }
 }

src/SPC/builder/macos/library/nghttp2.php

@@ -53,7 +53,7 @@ class nghttp2 extends MacOSLibraryBase
 
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} " . ' ./configure ' .
+                './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
                 "--host={$this->builder->getOption('gnu-arch')}-apple-darwin " .

src/SPC/builder/macos/library/openssl.php

@@ -48,7 +48,7 @@ class openssl extends MacOSLibraryBase
 
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./Configure no-shared {$extra} " .
+                "./Configure no-shared {$extra} " .
                 '--prefix=/ ' . // use prefix=/
                 "--libdir={$lib} " .
                 '--openssldir=/System/Library/OpenSSL ' .

src/SPC/builder/macos/library/tidy.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class tidy extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\tidy;
+
+    public const NAME = 'tidy';
+}

src/SPC/builder/traits/UnixBuilderTrait.php

@@ -21,9 +21,6 @@ trait UnixBuilderTrait
     /** @var string cmake toolchain file */
     public string $cmake_toolchain_file;
 
-    /** @var string configure environments */
-    public string $configure_env;
-
     /**
      * @throws WrongUsageException
      * @throws FileSystemException
@@ -66,18 +63,10 @@ trait UnixBuilderTrait
             if ($ret !== 0 || trim(implode('', $output)) !== 'hello') {
                 throw new RuntimeException('cli failed sanity check');
             }
+
             foreach ($this->exts as $ext) {
                 logger()->debug('testing ext: ' . $ext->getName());
-                [$ret] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php --ri "' . $ext->getDistName() . '"', false);
-                if ($ret !== 0) {
-                    throw new RuntimeException('extension ' . $ext->getName() . ' failed compile check');
-                }
-                if (file_exists(ROOT_DIR . '/src/globals/tests/' . $ext->getName() . '.php')) {
-                    [$ret] = shell()->execWithResult(BUILD_ROOT_PATH . '/bin/php ' . ROOT_DIR . '/src/globals/tests/' . $ext->getName() . '.php');
-                    if ($ret !== 0) {
-                        throw new RuntimeException('extension ' . $ext->getName() . ' failed sanity check');
-                    }
-                }
+                $ext->runCliCheck();
             }
         }
 
@@ -136,12 +125,35 @@ trait UnixBuilderTrait
      */
     public function makeCmakeArgs(): string
     {
-        [$lib, $include] = SEPARATED_PATH;
-        $extra = $this instanceof LinuxBuilder ? '-DCMAKE_C_COMPILER=' . $this->getOption('cc') . ' ' : '';
-        return $extra . '-DCMAKE_BUILD_TYPE=Release ' .
+        $extra = $this instanceof LinuxBuilder ? '-DCMAKE_C_COMPILER=' . getenv('CC') . ' ' : '';
+        return $extra .
+            '-DCMAKE_BUILD_TYPE=Release ' .
             '-DCMAKE_INSTALL_PREFIX=/ ' .
-            "-DCMAKE_INSTALL_LIBDIR={$lib} " .
-            "-DCMAKE_INSTALL_INCLUDEDIR={$include} " .
+            '-DCMAKE_INSTALL_BINDIR=/bin ' .
+            '-DCMAKE_INSTALL_LIBDIR=/lib ' .
+            '-DCMAKE_INSTALL_INCLUDEDIR=/include ' .
             "-DCMAKE_TOOLCHAIN_FILE={$this->cmake_toolchain_file}";
     }
+
+    /**
+     * Generate configure flags
+     */
+    public function makeAutoconfFlags(int $flag = AUTOCONF_ALL): string
+    {
+        $extra = '';
+        // TODO: add auto pkg-config support
+        if (($flag & AUTOCONF_LIBS) === AUTOCONF_LIBS) {
+            $extra .= 'LIBS="' . BUILD_LIB_PATH . '" ';
+        }
+        if (($flag & AUTOCONF_CFLAGS) === AUTOCONF_CFLAGS) {
+            $extra .= 'CFLAGS="-I' . BUILD_INCLUDE_PATH . '" ';
+        }
+        if (($flag & AUTOCONF_CPPFLAGS) === AUTOCONF_CPPFLAGS) {
+            $extra .= 'CPPFLAGS="-I' . BUILD_INCLUDE_PATH . '" ';
+        }
+        if (($flag & AUTOCONF_LDFLAGS) === AUTOCONF_LDFLAGS) {
+            $extra .= 'LDFLAGS="-L' . BUILD_LIB_PATH . '" ';
+        }
+        return $extra;
+    }
 }

src/SPC/builder/traits/UnixLibraryTrait.php

@@ -66,7 +66,7 @@ trait UnixLibraryTrait
      * @throws FileSystemException
      * @throws RuntimeException
      */
-    public function patchPkgconfPrefix(array $files, int $patch_option = PKGCONF_PATCH_ALL): void
+    public function patchPkgconfPrefix(array $files, int $patch_option = PKGCONF_PATCH_ALL, ?array $custom_replace = null): void
     {
         logger()->info('Patching library [' . static::NAME . '] pkgconfig');
         foreach ($files as $name) {
@@ -81,6 +81,7 @@ trait UnixLibraryTrait
             $file = ($patch_option & PKGCONF_PATCH_EXEC_PREFIX) === PKGCONF_PATCH_EXEC_PREFIX ? preg_replace('/^exec_prefix=.*$/m', 'exec_prefix=${prefix}', $file) : $file;
             $file = ($patch_option & PKGCONF_PATCH_LIBDIR) === PKGCONF_PATCH_LIBDIR ? preg_replace('/^libdir=.*$/m', 'libdir=${prefix}/lib', $file) : $file;
             $file = ($patch_option & PKGCONF_PATCH_INCLUDEDIR) === PKGCONF_PATCH_INCLUDEDIR ? preg_replace('/^includedir=.*$/m', 'includedir=${prefix}/include', $file) : $file;
+            $file = ($patch_option & PKGCONF_PATCH_CUSTOM) === PKGCONF_PATCH_CUSTOM && $custom_replace !== null ? preg_replace($custom_replace[0], $custom_replace[1], $file) : $file;
             FileSystem::writeFile($realpath, $file);
         }
     }

src/SPC/builder/unix/library/brotli.php

@@ -19,7 +19,7 @@ trait brotli
         FileSystem::resetDir($this->source_dir . '/build-dir');
         shell()->cd($this->source_dir . '/build-dir')
             ->exec(
-                $this->builder->configure_env . ' cmake ' .
+                'cmake ' .
                 "{$this->builder->makeCmakeArgs()} " .
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '..'
@@ -28,9 +28,9 @@ trait brotli
             ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
         $this->patchPkgconfPrefix(['libbrotlicommon.pc', 'libbrotlidec.pc', 'libbrotlienc.pc']);
         shell()->cd(BUILD_ROOT_PATH . '/lib')
-            ->exec('ln -s libbrotlicommon-static.a libbrotlicommon.a')
-            ->exec('ln -s libbrotlidec-static.a libbrotlidec.a')
-            ->exec('ln -s libbrotlienc-static.a libbrotlienc.a');
+            ->exec('ln -s libbrotlicommon.a libbrotlicommon-static.a')
+            ->exec('ln -s libbrotlidec.a libbrotlidec-static.a')
+            ->exec('ln -s libbrotlienc.a libbrotlienc-static.a');
         foreach (FileSystem::scanDirFiles(BUILD_ROOT_PATH . '/lib/', false, true) as $filename) {
             if (str_starts_with($filename, 'libbrotli') && (str_contains($filename, '.so') || str_ends_with($filename, '.dylib'))) {
                 unlink(BUILD_ROOT_PATH . '/lib/' . $filename);

src/SPC/builder/unix/library/bzip2.php

@@ -9,8 +9,8 @@ trait bzip2
     protected function build(): void
     {
         shell()->cd($this->source_dir)
-            ->exec("make {$this->builder->configure_env} PREFIX='" . BUILD_ROOT_PATH . "' clean")
-            ->exec("make -j{$this->builder->concurrency} {$this->builder->configure_env} PREFIX='" . BUILD_ROOT_PATH . "' libbz2.a")
+            ->exec("make PREFIX='" . BUILD_ROOT_PATH . "' clean")
+            ->exec("make -j{$this->builder->concurrency} {$this->builder->getEnvString()} PREFIX='" . BUILD_ROOT_PATH . "' libbz2.a")
             ->exec('cp libbz2.a ' . BUILD_LIB_PATH)
             ->exec('cp bzlib.h ' . BUILD_INCLUDE_PATH);
     }

src/SPC/builder/unix/library/curl.php

@@ -39,8 +39,8 @@ trait curl
         } else {
             $extra .= '-DUSE_NGHTTP2=OFF ';
         }
-        // TODO: ldap is not supported yet
-        $extra .= '-DCURL_DISABLE_LDAP=ON ';
+        // lib:ldap
+        $extra .= $this->builder->getLib('ldap') ? '-DCURL_DISABLE_LDAP=OFF ' : '-DCURL_DISABLE_LDAP=ON ';
         // lib:zstd
         $extra .= $this->builder->getLib('zstd') ? '-DCURL_ZSTD=ON ' : '-DCURL_ZSTD=OFF ';
         // lib:idn2
@@ -52,7 +52,7 @@ trait curl
         // compile！
         shell()->cd($this->source_dir . '/build')
             ->exec('sed -i.save s@\${CMAKE_C_IMPLICIT_LINK_LIBRARIES}@@ ../CMakeLists.txt')
-            ->exec("{$this->builder->configure_env} cmake {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF -DBUILD_CURL_EXE=OFF {$extra} ..")
+            ->exec("cmake {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF -DBUILD_CURL_EXE=OFF {$extra} ..")
             ->exec("make -j{$this->builder->concurrency}")
             ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
         // patch pkgconf

src/SPC/builder/unix/library/freetype.php

@@ -26,8 +26,9 @@ trait freetype
         $suggested .= ' ';
 
         shell()->cd($this->source_dir)
+            ->exec('sh autogen.sh')
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                './configure ' .
                 '--enable-static --disable-shared --without-harfbuzz --prefix= ' .
                 $suggested
             )

src/SPC/builder/unix/library/gmp.php

@@ -17,7 +17,7 @@ trait gmp
     {
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                './configure ' .
                 '--enable-static --disable-shared ' .
                 '--prefix='
             )

src/SPC/builder/unix/library/imagemagick.php

@@ -4,6 +4,8 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
+use SPC\builder\linux\library\LinuxLibraryBase;
+use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;
@@ -16,23 +18,37 @@ trait imagemagick
      */
     protected function build(): void
     {
-        $extra = '--without-jxl --without-xml --without-zstd --without-x --disable-openmp ';
-        // libzip support
-        $extra .= $this->builder->getLib('libzip') ? '--with-zip ' : '--without-zip ';
-        // jpeg support
-        $extra .= $this->builder->getLib('libjpeg') ? '--with-jpeg ' : '';
-        // png support
-        $extra .= $this->builder->getLib('libpng') ? '--with-png ' : '';
-        // webp support
-        $extra .= $this->builder->getLib('libwebp') ? '--with-webp ' : '';
-        // zstd support
-        // $extra .= $this->builder->getLib('zstd') ? '--with-zstd ' : '--without-zstd ';
-        // freetype support
-        $extra .= $this->builder->getLib('freetype') ? '--with-freetype ' : '--without-freetype ';
+        // TODO: imagemagick build with bzip2 failed with bugs, we need to fix it in the future
+        $extra = '--without-jxl --without-x --disable-openmp --without-bzlib ';
+        $required_libs = '';
+        $optional_libs = [
+            'libzip' => 'zip',
+            'libjpeg' => 'jpeg',
+            'libpng' => 'png',
+            'libwebp' => 'webp',
+            'libxml2' => 'xml',
+            'zlib' => 'zlib',
+            'xz' => 'lzma',
+            'zstd' => 'zstd',
+            'freetype' => 'freetype',
+        ];
+        foreach ($optional_libs as $lib => $option) {
+            $extra .= $this->builder->getLib($lib) ? "--with-{$option} " : "--without-{$option} ";
+            if ($this->builder->getLib($lib) instanceof LinuxLibraryBase) {
+                $required_libs .= ' ' . $this->builder->getLib($lib)->getStaticLibFiles();
+            }
+        }
 
+        $ldflags = $this instanceof LinuxLibraryBase ? ('LDFLAGS="-static" ') : '';
+
+        // libxml iconv patch
+        $required_libs .= $this instanceof MacOSLibraryBase ? (' -liconv') : '';
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                'PKG_CONFIG="$PKG_CONFIG --static" ' .
+                $ldflags .
+                "LIBS='{$required_libs}' " .
+                './configure ' .
                 '--enable-static --disable-shared ' .
                 $extra .
                 '--prefix='

src/SPC/builder/unix/library/ldap.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+trait ldap
+{
+    protected function build(): void
+    {
+        $alt = '';
+        // openssl support
+        $alt .= $this->builder->getLib('openssl') && $this->builder->getExt('zlib') ? '--with-tls=openssl ' : '';
+        // gmp support
+        $alt .= $this->builder->getLib('gmp') ? '--with-mp=gmp ' : '';
+        // libsodium support
+        $alt .= $this->builder->getLib('libsodium') ? '--with-argon2=libsodium ' : '';
+        f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
+        f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
+        shell()->cd($this->source_dir)
+            ->exec(
+                $this->builder->makeAutoconfFlags(AUTOCONF_LDFLAGS | AUTOCONF_CPPFLAGS) .
+                ' ./configure ' .
+                '--enable-static ' .
+                '--disable-shared ' .
+                '--disable-slapd ' .
+                '--disable-slurpd ' .
+                '--without-systemd ' .
+                '--without-cyrus-sasl ' .
+                $alt .
+                '--prefix='
+            )
+            ->exec('make clean')
+            // remove tests and doc to prevent compile failed with error: soelim not found
+            ->exec('sed -i -e "s/SUBDIRS= include libraries clients servers tests doc/SUBDIRS= include libraries clients servers/g" Makefile')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+        $this->patchPkgconfPrefix(['ldap.pc', 'lber.pc']);
+    }
+}

src/SPC/builder/unix/library/libavif.php

@@ -22,12 +22,7 @@ trait libavif
         FileSystem::resetDir($this->source_dir . '/build');
         // Start build
         shell()->cd($this->source_dir . '/build')
-            ->exec(
-                "{$this->builder->configure_env} cmake " .
-                $this->builder->makeCmakeArgs() . ' ' .
-                '-DBUILD_SHARED_LIBS=OFF ' .
-                '..'
-            )
+            ->exec("cmake {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF ..")
             ->exec("cmake --build . -j {$this->builder->concurrency}")
             ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
         // patch pkgconfig

src/SPC/builder/unix/library/libevent.php

@@ -21,7 +21,7 @@ trait libevent
         // Start build
         shell()->cd($this->source_dir . '/build')
             ->exec(
-                "{$this->builder->configure_env} cmake " .
+                'cmake ' .
                 '-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
                 "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
                 '-DCMAKE_BUILD_TYPE=Release ' .

src/SPC/builder/unix/library/libiconv.php

@@ -12,7 +12,7 @@ trait libiconv
 
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
                 '--prefix='

src/SPC/builder/unix/library/libjpeg.php

@@ -23,7 +23,7 @@ trait libjpeg
         // Start build
         shell()->cd($this->source_dir . '/build')
             ->exec(
-                "{$this->builder->configure_env} cmake {$this->builder->makeCmakeArgs()} " .
+                "cmake {$this->builder->makeCmakeArgs()} " .
                 '-DENABLE_STATIC=ON ' .
                 '-DENABLE_SHARED=OFF ' .
                 '..'

src/SPC/builder/unix/library/libsodium.php

@@ -10,7 +10,7 @@ trait libsodium
     {
         $root = BUILD_ROOT_PATH;
         shell()->cd($this->source_dir)
-            ->exec("{$this->builder->configure_env} ./configure --enable-static --disable-shared --prefix={$root}")
+            ->exec("./configure --enable-static --disable-shared --prefix={$root}")
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency}")
             ->exec('make install');

src/SPC/builder/unix/library/libssh2.php

@@ -21,7 +21,7 @@ trait libssh2
         FileSystem::resetDir($this->source_dir . '/build');
         shell()->cd($this->source_dir . '/build')
             ->exec(
-                "{$this->builder->configure_env} " . ' cmake ' .
+                'cmake ' .
                 "{$this->builder->makeCmakeArgs()} " .
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DBUILD_EXAMPLES=OFF ' .
@@ -29,7 +29,7 @@ trait libssh2
                 "-DENABLE_ZLIB_COMPRESSION={$enable_zlib} " .
                 '..'
             )
-            ->exec("cmake --build . -j {$this->builder->concurrency} --target libssh2")
+            ->exec("cmake --build . -j {$this->builder->concurrency}")
             ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
         $this->patchPkgconfPrefix(['libssh2.pc']);
     }

src/SPC/builder/unix/library/libwebp.php

@@ -23,7 +23,7 @@ trait libwebp
         // Start build
         shell()->cd($this->source_dir . '/build')
             ->exec(
-                "{$this->builder->configure_env} cmake " .
+                'cmake ' .
                 $this->builder->makeCmakeArgs() . ' ' .
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DWEBP_BUILD_EXTRAS=ON ' .
@@ -32,7 +32,10 @@ trait libwebp
             ->exec("cmake --build . -j {$this->builder->concurrency}")
             ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
         // patch pkgconfig
-        $this->patchPkgconfPrefix(['libsharpyuv.pc', 'libwebp.pc', 'libwebpdecoder.pc', 'libwebpdemux.pc', 'libwebpmux.pc'], PKGCONF_PATCH_PREFIX);
+        $this->patchPkgconfPrefix(['libsharpyuv.pc', 'libwebp.pc', 'libwebpdecoder.pc', 'libwebpdemux.pc', 'libwebpmux.pc'], PKGCONF_PATCH_PREFIX | PKGCONF_PATCH_LIBDIR);
+        $this->patchPkgconfPrefix(['libsharpyuv.pc'], PKGCONF_PATCH_CUSTOM, ['/^includedir=.*$/m', 'includedir=${prefix}/include/webp']);
         $this->cleanLaFiles();
+        // fix imagemagick binary linking issue
+        $this->patchPkgconfPrefix(['libwebp.pc'], PKGCONF_PATCH_CUSTOM, ['/-lwebp$/m', '-lwebp -lsharpyuv']);
     }
 }

src/SPC/builder/unix/library/libxslt.php

@@ -4,20 +4,34 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
+use SPC\builder\linux\library\LinuxLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
 
 trait libxslt
 {
     /**
      * @throws FileSystemException
      * @throws RuntimeException
+     * @throws WrongUsageException
      */
     protected function build(): void
     {
+        $required_libs = '';
+        foreach ($this->getDependencies() as $dep) {
+            if ($dep instanceof LinuxLibraryBase) {
+                $required_libs .= ' ' . $dep->getStaticLibFiles();
+            }
+        }
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                'CFLAGS="-I' . BUILD_INCLUDE_PATH . '" ' .
+                "{$this->builder->getOption('library_path')} " .
+                "{$this->builder->getOption('ld_library_path')} " .
+                'LDFLAGS="-L' . BUILD_LIB_PATH . '" ' .
+                "LIBS='{$required_libs} -lstdc++' " .
+                './configure ' .
                 '--enable-static --disable-shared ' .
                 '--without-python ' .
                 '--without-mem-debug ' .

src/SPC/builder/unix/library/libyaml.php

@@ -60,7 +60,7 @@ EOF
         FileSystem::resetDir($this->source_dir . '/build');
         shell()->cd($this->source_dir . '/build')
             ->exec(
-                "{$this->builder->configure_env} cmake " .
+                'cmake ' .
                 // '--debug-find ' .
                 '-DCMAKE_BUILD_TYPE=Release ' .
                 '-DBUILD_TESTING=OFF ' .

src/SPC/builder/unix/library/libzip.php

@@ -29,7 +29,7 @@ trait libzip
         FileSystem::resetDir($this->source_dir . '/build');
         shell()->cd($this->source_dir . '/build')
             ->exec(
-                "{$this->builder->configure_env} " . ' cmake ' .
+                'cmake ' .
                 "{$this->builder->makeCmakeArgs()} " .
                 '-DENABLE_GNUTLS=OFF ' .
                 '-DENABLE_MBEDTLS=OFF ' .

src/SPC/builder/unix/library/ncurses.php

@@ -10,7 +10,7 @@ trait ncurses
     {
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
                 '--enable-overwrite ' .

src/SPC/builder/unix/library/onig.php

@@ -18,12 +18,7 @@ trait onig
         [,,$destdir] = SEPARATED_PATH;
 
         shell()->cd($this->source_dir)
-            ->exec(
-                "{$this->builder->configure_env} " . ' ./configure ' .
-                '--enable-static ' .
-                '--disable-shared ' .
-                '--prefix='
-            )
+            ->exec('./configure --enable-static --disable-shared --prefix=')
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency}")
             ->exec("make install DESTDIR={$destdir}");

src/SPC/builder/unix/library/pkgconfig.php

@@ -8,13 +8,8 @@ trait pkgconfig
 {
     protected function build(): void
     {
-        $macos_env = 'PKG_CONFIG_PATH="' . BUILD_LIB_PATH . '/pkgconfig/" ' .
-            "CC='{$this->builder->getOption('cc')}' " .
-            "CXX='{$this->builder->getOption('cxx')}' " .
-            "CFLAGS='{$this->builder->arch_c_flags} -Wimplicit-function-declaration' ";
-        $linux_env = 'PKG_CONFIG_PATH="' . BUILD_LIB_PATH . '/pkgconfig" ' .
-            "CC='{$this->builder->getOption('cc')}' " .
-            "CXX='{$this->builder->getOption('cxx')}' ";
+        $macos_env = "CFLAGS='{$this->builder->arch_c_flags} -Wimplicit-function-declaration' ";
+        $linux_env = 'LDFLAGS=--static ';
 
         shell()->cd($this->source_dir)
             ->exec(

src/SPC/builder/unix/library/postgresql.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\builder\unix\library;
 
+use SPC\builder\linux\library\LinuxLibraryBase;
 use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
@@ -18,25 +19,44 @@ trait postgresql
     protected function build(): void
     {
         $builddir = BUILD_ROOT_PATH;
-        $env = $this->builder->configure_env;
-        $envs = $env;
-        $packages = 'openssl zlib  readline libxml-2.0'; // icu-uc icu-io icu-i18n libzstd
+        $envs = '';
+        $packages = 'zlib openssl readline libxml-2.0';
+        $optional_packages = [
+            'zstd' => 'libzstd',
+            // 'ldap' => 'ldap',
+            'libxslt' => 'libxslt',
+            'icu' => 'icu-i18n',
+        ];
 
-        $pkgconfig_executable = $builddir . '/bin/pkg-config';
-        $output = shell()->execWithResult($env . " {$pkgconfig_executable} --cflags-only-I --static " . $packages);
+        f_putenv('PKG_CONFIG=' . BUILD_ROOT_PATH . '/bin/pkg-config');
+        f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig');
+
+        foreach ($optional_packages as $lib => $pkg) {
+            if ($this->getBuilder()->getLib($lib)) {
+                $packages .= ' ' . $pkg;
+                $output = shell()->execWithResult("pkg-config --static {$pkg}");
+                logger()->info(var_export($output[1], true));
+            }
+        }
+
+        $output = shell()->execWithResult("pkg-config --cflags-only-I --static {$packages}");
         if (!empty($output[1][0])) {
             $cppflags = $output[1][0];
             $envs .= " CPPFLAGS=\"{$cppflags}\"";
         }
-        $output = shell()->execWithResult($env . " {$pkgconfig_executable} --libs-only-L --static " . $packages);
+        $output = shell()->execWithResult("pkg-config --libs-only-L --static {$packages}");
         if (!empty($output[1][0])) {
             $ldflags = $output[1][0];
             $envs .= $this instanceof MacOSLibraryBase ? " LDFLAGS=\"{$ldflags}\" " : " LDFLAGS=\"{$ldflags} -static\" ";
         }
-        $output = shell()->execWithResult($env . " {$pkgconfig_executable} --libs-only-l --static " . $packages);
+        $output = shell()->execWithResult("pkg-config --libs-only-l --static {$packages}");
         if (!empty($output[1][0])) {
             $libs = $output[1][0];
-            $envs .= " LIBS=\"{$libs}\" ";
+            $libcpp = '';
+            if ($this->builder->getLib('icu')) {
+                $libcpp = $this instanceof LinuxLibraryBase ? ' -lstdc++' : ' -lc++';
+            }
+            $envs .= " LIBS=\"{$libs}{$libcpp}\" ";
         }
 
         FileSystem::resetDir($this->source_dir . '/build');
@@ -44,8 +64,8 @@ trait postgresql
         # 有静态链接配置  参考文件： src/interfaces/libpq/Makefile
         shell()->cd($this->source_dir . '/build')
             ->exec('sed -i.backup "s/invokes exit\'; exit 1;/invokes exit\';/"  ../src/interfaces/libpq/Makefile')
-            ->exec(' sed -i.backup "293 s/^/#$/"  ../src/Makefile.shlib')
-            ->exec('sed -i.backup "441 s/^/#$/"  ../src/Makefile.shlib');
+            ->exec('sed -i.backup "278 s/^/# /"  ../src/Makefile.shlib')
+            ->exec('sed -i.backup "402 s/^/# /"  ../src/Makefile.shlib');
 
         // configure
         shell()->cd($this->source_dir . '/build')
@@ -59,25 +79,23 @@ trait postgresql
                 '--with-libxml ' .
                 ($this->builder->getLib('icu') ? '--with-icu ' : '--without-icu ') .
                 '--without-ldap ' .
-                '--without-libxslt ' .
+                ($this->builder->getLib('libxslt') ? '--with-libxslt ' : '--without-libxslt ') .
+                ($this->builder->getLib('zstd') ? '--with-zstd ' : '--without-zstd ') .
                 '--without-lz4 ' .
-                '--without-zstd ' .
                 '--without-perl ' .
                 '--without-python ' .
                 '--without-pam ' .
-                '--without-ldap ' .
                 '--without-bonjour ' .
                 '--without-tcl '
             );
+        // ($this->builder->getLib('ldap') ? '--with-ldap ' : '--without-ldap ') .
 
         // build
         shell()->cd($this->source_dir . '/build')
             ->exec($envs . ' make -C src/bin/pg_config install')
             ->exec($envs . ' make -C src/include install')
             ->exec($envs . ' make -C src/common install')
-            ->exec($envs . ' make -C src/backend/port install')
             ->exec($envs . ' make -C src/port install')
-            ->exec($envs . ' make -C src/backend/libpq install')
             ->exec($envs . ' make -C src/interfaces/libpq install');
 
         // remove dynamic libs

src/SPC/builder/unix/library/readline.php

@@ -17,7 +17,7 @@ trait readline
     {
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                './configure ' .
                 '--enable-static=yes ' .
                 '--enable-shared=no ' .
                 '--prefix= ' .

src/SPC/builder/unix/library/snappy.php

@@ -20,15 +20,14 @@ trait snappy
 
         shell()->cd($this->source_dir . '/cmake/build')
             ->exec(
-                "{$this->builder->configure_env} cmake " .
+                'cmake ' .
                 "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
-                '-DCMAKE_BUILD_TYPE=Release ' .
-                '-DCMAKE_INSTALL_PREFIX=' . escapeshellarg(BUILD_ROOT_PATH) . ' ' .
+                "{$this->builder->makeCmakeArgs()} " .
                 '-DSNAPPY_BUILD_TESTS=OFF ' .
                 '-DSNAPPY_BUILD_BENCHMARKS=OFF ' .
                 '../..'
             )
             ->exec("cmake --build . -j {$this->builder->concurrency}")
-            ->exec('make install');
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
     }
 }

src/SPC/builder/unix/library/sqlite.php

@@ -9,7 +9,7 @@ trait sqlite
     protected function build(): void
     {
         shell()->cd($this->source_dir)
-            ->exec("{$this->builder->configure_env} ./configure --enable-static --disable-shared --prefix=")
+            ->exec('./configure --enable-static --disable-shared --prefix=')
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency}")
             ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);

src/SPC/builder/unix/library/tidy.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
+
+trait tidy
+{
+    /**
+     * @throws RuntimeException
+     * @throws FileSystemException
+     */
+    protected function build(): void
+    {
+        FileSystem::resetDir($this->source_dir . '/build-dir');
+        shell()->cd($this->source_dir . '/build-dir')
+            ->exec(
+                'cmake ' .
+                "{$this->builder->makeCmakeArgs()} " .
+                '-DBUILD_SHARED_LIB=OFF ' .
+                '-DSUPPORT_CONSOLE_APP=OFF ' .
+                '..'
+            )
+            ->exec("cmake --build . -j {$this->builder->concurrency}")
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+        $this->patchPkgconfPrefix(['tidy.pc']);
+    }
+}

src/SPC/builder/unix/library/xz.php

@@ -17,7 +17,7 @@ trait xz
     {
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
                 "--host={$this->builder->getOption('gnu-arch')}-unknown-linux " .

src/SPC/builder/unix/library/zlib.php

@@ -18,7 +18,7 @@ trait zlib
         [,,$destdir] = SEPARATED_PATH;
 
         shell()->cd($this->source_dir)
-            ->exec("{$this->builder->configure_env} ./configure --static --prefix=")
+            ->exec('./configure --static --prefix=')
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency}")
             ->exec("make install DESTDIR={$destdir}");