Remove SPC_NO_MUSL_PATH, remove --libc, use SPC_LIBC instead (#642)

* Remove SPC_NO_MUSL_PATH, remove --libc, use SPC_LIBC instead

* Fix tests

* Internally use GNU_ARCH for unified

* Update EXTENSION_DIR comments for env.ini

* Remove redundant -fPIC cflags in curl

Author: crazywhalecc

.github/workflows/tests.yml

@@ -100,14 +100,13 @@ jobs:
           path: vendor
           key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-php-
+            ${{ runner.os }}-php
 
       - name: "Install Dependencies"
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
       - name: "Run PHPUnit Tests"
-        run: |
-          SPC_NO_MUSL_PATH=yes vendor/bin/phpunit tests/ --no-coverage
+        run: SPC_LIBC=glibc vendor/bin/phpunit tests/ --no-coverage
 
   define-matrix:
     name: "Define Matrix"

bin/build-static-frankenphp

@@ -92,7 +92,7 @@ ADD ./bin/spc /app/bin/spc
 RUN /app/bin/setup-runtime
 RUN /app/bin/php /app/bin/composer install --no-dev --classmap-authoritative
 ENV PATH="/app/bin:/cmake/bin:/usr/local/go/bin:$PATH"
-ENV SPC_SKIP_DOCTOR_CHECK_ITEMS="if musl-wrapper is installed,if musl-cross-make is installed"
+ENV SPC_LIBC=glibc
 
 ADD ./config/env.ini /app/config/env.ini
 RUN bin/spc doctor --auto-fix --debug
@@ -141,13 +141,12 @@ MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/pkgroot:/app/pkgroot"
 MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/frankenphp-dist:/frankenphp/dist"
 
 # Apply env in temp env file
-echo 'SPC_SKIP_DOCTOR_CHECK_ITEMS=if musl-wrapper is installed,if musl-cross-make is installed' > /tmp/spc-gnu-docker.env
-echo 'CC=/opt/rh/devtoolset-10/root/usr/bin/gcc' >> /tmp/spc-gnu-docker.env
+echo 'CC=/opt/rh/devtoolset-10/root/usr/bin/gcc' > /tmp/spc-gnu-docker.env
 echo 'CXX=/opt/rh/devtoolset-10/root/usr/bin/g++' >> /tmp/spc-gnu-docker.env
 echo 'AR=/opt/rh/devtoolset-10/root/usr/bin/ar' >> /tmp/spc-gnu-docker.env
 echo 'LD=/opt/rh/devtoolset-10/root/usr/bin/ld' >> /tmp/spc-gnu-docker.env
 echo 'SPC_DEFAULT_C_FLAGS=-fPIE -fPIC' >> /tmp/spc-gnu-docker.env
-echo 'SPC_NO_MUSL_PATH=yes' >> /tmp/spc-gnu-docker.env
+echo 'SPC_LIBC=glibc' >> /tmp/spc-gnu-docker.env
 echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-Wl,-O1 -pie"' >> /tmp/spc-gnu-docker.env
 echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil -lrt"' >> /tmp/spc-gnu-docker.env
 

bin/spc-gnu-docker

@@ -88,7 +88,7 @@ ADD ./bin/spc /app/bin/spc
 RUN /app/bin/setup-runtime
 RUN /app/bin/php /app/bin/composer install --no-dev --classmap-authoritative
 ENV PATH="/app/bin:/cmake/bin:$PATH"
-ENV SPC_SKIP_DOCTOR_CHECK_ITEMS="if musl-wrapper is installed,if musl-cross-make is installed"
+ENV SPC_LIBC=glibc
 
 ADD ./config/env.ini /app/config/env.ini
 RUN bin/spc doctor --auto-fix --debug
@@ -131,13 +131,12 @@ MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/downloads:/app/downloads"
 MOUNT_LIST="$MOUNT_LIST -v ""$(pwd)""/pkgroot:/app/pkgroot"
 
 # Apply env in temp env file
-echo 'SPC_SKIP_DOCTOR_CHECK_ITEMS=if musl-wrapper is installed,if musl-cross-make is installed' > /tmp/spc-gnu-docker.env
-echo 'CC=/opt/rh/devtoolset-10/root/usr/bin/gcc' >> /tmp/spc-gnu-docker.env
+echo 'CC=/opt/rh/devtoolset-10/root/usr/bin/gcc' > /tmp/spc-gnu-docker.env
 echo 'CXX=/opt/rh/devtoolset-10/root/usr/bin/g++' >> /tmp/spc-gnu-docker.env
 echo 'AR=/opt/rh/devtoolset-10/root/usr/bin/ar' >> /tmp/spc-gnu-docker.env
 echo 'LD=/opt/rh/devtoolset-10/root/usr/bin/ld' >> /tmp/spc-gnu-docker.env
 echo 'SPC_DEFAULT_C_FLAGS=-fPIE -fPIC' >> /tmp/spc-gnu-docker.env
-echo 'SPC_NO_MUSL_PATH=yes' >> /tmp/spc-gnu-docker.env
+echo 'SPC_LIBC=glibc' >> /tmp/spc-gnu-docker.env
 echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-Wl,-O1 -pie"' >> /tmp/spc-gnu-docker.env
 echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil -lrt"' >> /tmp/spc-gnu-docker.env
 

config/env.ini

@@ -7,8 +7,11 @@
 ;
 ; We need to use some pre-defined internal env vars, like `BUILD_ROOT_PATH`, `DOWNLOAD_PATH`, etc.
 ; Please note that these vars cannot be defined in this file, they are only be defined before static-php-cli running.
-; Here's a list of these pre-defined internal env vars, these vars are only be defined in the static-php-cli build process if not set in the shell environment:
 ;
+; Here's a list of env vars, these value cannot be changed anywhere:
+;
+;   WORKING_DIR:        the working directory of the build process. (default: `$(pwd)`)
+;   ROOT_DIR:           the root directory of static-php-cli. (default: `/path/to/static-php-cli`, when running in phar or micro mode: `phar://path/to/spc.phar`)
 ;   BUILD_ROOT_PATH:    the root path of the build process. (default: `$(pwd)/buildroot`)
 ;   BUILD_INCLUDE_PATH: the path of the include files. (default: `$BUILD_ROOT_PATH/include`)
 ;   BUILD_LIB_PATH:     the path of the lib files. (default: `$BUILD_ROOT_PATH/lib`)
@@ -17,21 +20,17 @@
 ;   SOURCE_PATH:        the path of the source files. (default: `$(pwd)/source`)
 ;   DOWNLOAD_PATH:      the path of the download files. (default: `$(pwd)/downloads`)
 ;   CPU_COUNT:          the count of the CPU cores. (default: `$(nproc)`)
+;   SPC_ARCH:           the arch of the current system, for some libraries needed `--host=XXX` args. (default: `$(uname -m)`, e.g. `x86_64`, `aarch64`, `arm64`)
 ;   GNU_ARCH:           the GNU arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `aarch64`)
 ;   MAC_ARCH:           the MAC arch of the current system. (default: `$(uname -m)`, e.g. `x86_64`, `arm64`)
 ;
-; Here's a list of env vars, these value cannot be changed anywhere:
-;
-;   WORKING_DIR:        the working directory of the build process. (default: `$(pwd)`)
-;   ROOT_DIR:           the root directory of static-php-cli. (default: `/path/to/static-php-cli`, when running in phar or micro mode: `phar://path/to/spc.phar`)
-;
-;   * These vars are only be defined in Unix (macOS, Linux, FreeBSD)Builder *
+;   * These vars are only be defined in Unix (macOS, Linux, FreeBSD)Builder and cannot be changed anywhere:
 ;   PATH:                               static-php-cli will add `$BUILD_BIN_PATH` to PATH.
 ;   PKG_CONFIG:                         static-php-cli will set `$BUILD_BIN_PATH/pkg-config` to PKG_CONFIG.
 ;   PKG_CONFIG_PATH:                    static-php-cli will set `$BUILD_LIB_PATH/pkgconfig` to PKG_CONFIG_PATH.
 ;   SPC_PHP_DEFAULT_OPTIMIZE_CFLAGS:    the default optimization CFLAGS for compiling php. (if --no-strip option is set: `-g -O0`, else: `-g -Os`)
 ;
-;   * These vars are only be defined in LinuxBuilder *
+;   * These vars are only be defined in LinuxBuilder and cannot be changed anywhere:
 ;   SPC_LINUX_DEFAULT_CC:                   the default compiler for linux. (For alpine linux: `gcc`, default: `$GNU_ARCH-linux-musl-gcc`)
 ;   SPC_LINUX_DEFAULT_CXX:                  the default c++ compiler for linux. (For alpine linux: `g++`, default: `$GNU_ARCH-linux-musl-g++`)
 ;   SPC_LINUX_DEFAULT_AR:                   the default archiver for linux. (For alpine linux: `ar`, default: `$GNU_ARCH-linux-musl-ar`)
@@ -45,7 +44,7 @@ SPC_SKIP_PHP_VERSION_CHECK="no"
 ; Ignore some check item for bin/spc doctor command, comma separated (e.g. SPC_SKIP_DOCTOR_CHECK_ITEMS="if homebrew has installed")
 SPC_SKIP_DOCTOR_CHECK_ITEMS=""
 ; EXTENSION_DIR where the built php will look for extension when a .ini instructs to load them
-; only useful for builds targeting glibc --libc=glibc
+; only useful for builds targeting not pure-static linking
 ; default paths
 ; Ubuntu/Debian: /usr/lib/php/{PHP_VERSION}/
 ; RHEL: /usr/lib64/php/modules
@@ -63,7 +62,7 @@ SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime
 
 [linux]
 ; include PATH for musl libc.
-SPC_NO_MUSL_PATH=no
+SPC_LIBC=musl
 ; compiler environments
 CC=${SPC_LINUX_DEFAULT_CC}
 CXX=${SPC_LINUX_DEFAULT_CXX}

docs/en/faq/index.md

@@ -32,7 +32,7 @@ supporting FFI extensions and loading the `xdebug.so` extension of the same PHP
 
 ```bash
 bin/spc-gnu-docker download --for-extensions=ffi,xml --with-php=8.4
-bin/spc-gnu-docker build --libc=glibc ffi,xml --build-cli --debug
+bin/spc-gnu-docker build ffi,xml --build-cli --debug
 
 buildroot/bin/php -d "zend_extension=/path/to/php{PHP_VER}-{ts/nts}/xdebug.so" --ri xdebug
 ```

docs/en/guide/build-with-glibc.md

@@ -46,10 +46,8 @@ After the image is built, you will see the same command help menu as `bin/spc`,
 After the container is ready, you can refer to the [local build](./manual-build) section to build your PHP static binary. 
 Just replace `bin/spc` or `./spc` with `bin/spc-gnu-docker`.
 
-Unlike the default build, when building in the glibc environment, you **must** add the parameter `--libc=glibc`, such as:
-
 ```bash
-bin/spc-gnu-docker --libc=glibc build bcmath,ctype,openssl,pdo,phar,posix,session,tokenizer,xml,zip --build-cli --debug
+bin/spc-gnu-docker build bcmath,ctype,openssl,pdo,phar,posix,session,tokenizer,xml,zip --build-cli --debug
 ```
 
 ## Notes

docs/zh/faq/index.md

@@ -29,7 +29,7 @@ PHP 默认也会从 [其他标准位置](https://www.php.net/manual/zh/configura
 
 ```bash
 bin/spc-gnu-docker download --for-extensions=ffi,xml --with-php=8.4
-bin/spc-gnu-docker build --libc=glibc ffi,xml --build-cli --debug
+bin/spc-gnu-docker build ffi,xml --build-cli --debug
 
 buildroot/bin/php -d "zend_extension=/path/to/php{PHP_VER}-{ts/nts}/xdebug.so" --ri xdebug
 ```

docs/zh/guide/build-with-glibc.md

@@ -39,10 +39,8 @@ bin/spc-gnu-docker
 
 在容器准备好后，你可以参考 [本地构建](./manual-build) 章节的内容，构建你的 PHP 静态二进制文件。仅需要把 `bin/spc` 或 `./spc` 替换为 `bin/spc-gnu-docker` 即可。
 
-与默认构建不同的是，在 glibc 环境构建时**必须添加**参数 `--libc=glibc`，如：
-
 ```bash
-bin/spc-gnu-docker --libc=glibc build bcmath,ctype,openssl,pdo,phar,posix,session,tokenizer,xml,zip --build-cli --debug
+bin/spc-gnu-docker build bcmath,ctype,openssl,pdo,phar,posix,session,tokenizer,xml,zip --build-cli --debug
 ```
 
 ## 注意事项

src/SPC/ConsoleApplication.php

@@ -4,8 +4,8 @@
 
 namespace SPC;
 
-use SPC\command\BuildCliCommand;
 use SPC\command\BuildLibsCommand;
+use SPC\command\BuildPHPCommand;
 use SPC\command\DeleteDownloadCommand;
 use SPC\command\dev\AllExtCommand;
 use SPC\command\dev\ExtVerCommand;
@@ -44,7 +44,7 @@ public function __construct()
         $this->addCommands(
             [
                 // Common commands
-                new BuildCliCommand(),
+                new BuildPHPCommand(),
                 new BuildLibsCommand(),
                 new DoctorCommand(),
                 new DownloadCommand(),

src/SPC/builder/linux/LinuxBuilder.php

@@ -15,8 +15,6 @@
 
 class LinuxBuilder extends UnixBuilderBase
 {
-    public string $libc;
-
     /** @var bool Micro patch phar flag */
     private bool $phar_patched = false;
 
@@ -27,27 +25,23 @@ class LinuxBuilder extends UnixBuilderBase
     public function __construct(array $options = [])
     {
         $this->options = $options;
-        SystemUtil::initLibcVar($this->options['libc'] ?? null);
-
-        $this->libc = getenv('SPC_LIBC') ?: LIBC_MUSL_WRAPPER;
 
         // check musl-cross make installed if we use musl-cross-make
         $arch = arch2gnu(php_uname('m'));
 
         GlobalEnvManager::init($this);
 
-        // set library path, some libraries need it. (We cannot use `putenv` here, because cmake will be confused)
-        if (!filter_var(getenv('SPC_NO_MUSL_PATH'), FILTER_VALIDATE_BOOLEAN) && $this->libc !== LIBC_GLIBC) {
+        if (getenv('SPC_LIBC') === 'musl' && !SystemUtil::isMuslDist()) {
             $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\"");
             GlobalEnvManager::putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . getenv('PATH'));
             $configure = getenv('SPC_CMD_PREFIX_PHP_CONFIGURE');
             $configure = "LD_LIBRARY_PATH=\"/usr/local/musl/{$arch}-linux-musl/lib\" " . $configure;
             GlobalEnvManager::putenv("SPC_CMD_PREFIX_PHP_CONFIGURE={$configure}");
-        }
 
-        if (str_ends_with(getenv('CC'), 'linux-musl-gcc') && !file_exists("/usr/local/musl/bin/{$arch}-linux-musl-gcc") && (getenv('SPC_NO_MUSL_PATH') !== 'yes')) {
-            throw new WrongUsageException('musl-cross-make not installed, please install it first. (You can use `doctor` command to install it)');
+            if (!file_exists("/usr/local/musl/{$arch}-linux-musl/lib/libc.a")) {
+                throw new WrongUsageException('You are building with musl-libc target in glibc distro, but musl-toolchain is not installed, please install musl-toolchain first. (You can use `doctor` command to install it)');
+            }
         }
 
         // concurrency
@@ -216,10 +210,8 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
             $this->buildEmbed();
         }
 
-        if (php_uname('m') === $this->getOption('arch')) {
-            $this->emitPatchPoint('before-sanity-check');
-            $this->sanityCheck($build_target);
-        }
+        $this->emitPatchPoint('before-sanity-check');
+        $this->sanityCheck($build_target);
     }
 
     /**