diff --git a/bin/spc-alpine-docker b/bin/spc-alpine-docker index 58c24ce7c..18e981f81 100755 --- a/bin/spc-alpine-docker +++ b/bin/spc-alpine-docker @@ -3,7 +3,7 @@ set -e # This file is using docker to run commands -SPC_DOCKER_VERSION=v4 +SPC_DOCKER_VERSION=v5 # Detect docker can run if ! which docker >/dev/null; then @@ -53,9 +53,9 @@ aarch64|arm64) exit 1 ;; esac -# if ALPINE_FROM is not set, use alpine:edge +# if ALPINE_FROM is not set, use alpine:3.21 if [ -z "$ALPINE_FROM" ]; then - ALPINE_FROM=alpine:edge + ALPINE_FROM=alpine:3.21 fi if [ "$SPC_USE_ARCH" != "$CURRENT_ARCH" ]; then echo "* Using different arch needs to setup qemu-static for docker !" @@ -64,7 +64,7 @@ if [ "$SPC_USE_ARCH" != "$CURRENT_ARCH" ]; then $DOCKER_EXECUTABLE run --rm --privileged multiarch/qemu-user-static:register --reset > /dev/null fi else - ALPINE_FROM=alpine:edge + ALPINE_FROM=alpine:3.21 fi if [ "$SPC_USE_MIRROR" = "yes" ]; then diff --git a/src/SPC/builder/LibraryBase.php b/src/SPC/builder/LibraryBase.php index fc6adefce..b97b59291 100644 --- a/src/SPC/builder/LibraryBase.php +++ b/src/SPC/builder/LibraryBase.php @@ -332,6 +332,15 @@ public function patchBeforeMake(): bool return false; } + /** + * Patch php-config after embed was built + * Example: imap requires -lcrypt + */ + public function patchPhpConfig(): bool + { + return false; + } + /** * Build this library. * diff --git a/src/SPC/builder/extension/imap.php b/src/SPC/builder/extension/imap.php index 9cc9a87fb..f36ffb1e3 100644 --- a/src/SPC/builder/extension/imap.php +++ b/src/SPC/builder/extension/imap.php @@ -5,6 +5,7 @@ namespace SPC\builder\extension; use SPC\builder\Extension; +use SPC\builder\linux\SystemUtil; use SPC\exception\WrongUsageException; use SPC\store\FileSystem; use SPC\util\CustomExt; @@ -41,4 +42,14 @@ public function getUnixConfigureArg(bool $shared = false): string } return $arg; } + + public function patchBeforeMake(): bool + { + if (PHP_OS_FAMILY !== 'Linux' || SystemUtil::isMuslDist()) { + return false; + } + $extra_libs = trim(getenv('SPC_EXTRA_LIBS') . ' -lcrypt'); + f_putenv('SPC_EXTRA_LIBS=' . $extra_libs); + return true; + } } diff --git a/src/SPC/builder/linux/library/imap.php b/src/SPC/builder/linux/library/imap.php index 781529c6a..8203928d4 100644 --- a/src/SPC/builder/linux/library/imap.php +++ b/src/SPC/builder/linux/library/imap.php @@ -7,6 +7,7 @@ use SPC\exception\FileSystemException; use SPC\exception\RuntimeException; use SPC\store\FileSystem; +use SPC\util\SPCTarget; class imap extends LinuxLibraryBase { @@ -34,6 +35,15 @@ public function patchBeforeBuild(): bool return true; } + public function patchPhpConfig(): bool + { + if (SPCTarget::getLibc() === 'glibc') { + FileSystem::replaceFileRegex(BUILD_BIN_PATH . '/php-config', '/^libs="(.*)"$/m', 'libs="$1 -lcrypt"'); + return true; + } + return false; + } + /** * @throws RuntimeException */ @@ -44,6 +54,8 @@ protected function build(): void } else { $ssl_options = 'SSLTYPE=none'; } + $libcVer = SPCTarget::getLibcVersion(); + $extraLibs = $libcVer && version_compare($libcVer, '2.17', '<=') ? 'EXTRALDFLAGS="-ldl -lrt -lpthread"' : ''; shell()->cd($this->source_dir) ->exec('make clean') ->exec('touch ip6') @@ -51,9 +63,7 @@ protected function build(): void ->exec('chmod +x tools/ua') ->exec('chmod +x src/osdep/unix/drivers') ->exec('chmod +x src/osdep/unix/mkauths') - ->exec( - "yes | make slx {$ssl_options} EXTRACFLAGS='-fPIC -fpermissive'" - ); + ->exec("yes | make slx {$ssl_options} EXTRACFLAGS='-fPIC -fpermissive' {$extraLibs}"); try { shell() ->exec("cp -rf {$this->source_dir}/c-client/c-client.a " . BUILD_LIB_PATH . '/libc-client.a') diff --git a/src/SPC/builder/unix/UnixBuilderBase.php b/src/SPC/builder/unix/UnixBuilderBase.php index 6f0d5045e..f0e4e169f 100644 --- a/src/SPC/builder/unix/UnixBuilderBase.php +++ b/src/SPC/builder/unix/UnixBuilderBase.php @@ -294,6 +294,11 @@ protected function patchPhpScripts(): void $php_config_str = preg_replace('/(libs=")(.*?)\s*(-lstdc\+\+)\s*(.*?)"/', '$1$2 $4 $3"', $php_config_str); FileSystem::writeFile(BUILD_BIN_PATH . '/php-config', $php_config_str); } + foreach ($this->getLibs() as $lib) { + if ($lib->patchPhpConfig()) { + logger()->debug("Library {$lib->getName()} patched php-config"); + } + } } /** diff --git a/src/SPC/store/SourceManager.php b/src/SPC/store/SourceManager.php index 02d072630..251e2fa18 100644 --- a/src/SPC/store/SourceManager.php +++ b/src/SPC/store/SourceManager.php @@ -66,7 +66,7 @@ public static function initSource(?array $sources = null, ?array $libs = null, ? $check = LockFile::getExtractPath($lock_name, SOURCE_PATH . '/' . $source); // $check = $lock[$lock_name]['move_path'] === null ? (SOURCE_PATH . '/' . $source) : (SOURCE_PATH . '/' . $lock[$lock_name]['move_path']); if (!is_dir($check)) { - logger()->debug('Extracting source [' . $source . '] to ' . $check . ' ...'); + logger()->debug("Extracting source [{$source}] to {$check} ..."); $filename = LockFile::getLockFullPath($lock_content); FileSystem::extractSource($source, $lock_content['source_type'], $filename, $check); LockFile::putLockSourceHash($lock_content, $check); @@ -81,7 +81,14 @@ public static function initSource(?array $sources = null, ?array $libs = null, ? // when source already extracted, detect if the extracted source hash is the same as the lock file one if (file_exists("{$check}/.spc-hash") && FileSystem::readFile("{$check}/.spc-hash") === $hash) { - logger()->debug('Source [' . $source . '] already extracted in ' . $check . ', skip !'); + logger()->debug("Source [{$source}] already extracted in {$check}, skip !"); + continue; + } + + // ext imap was included in php < 8.4 which we should not extract, + // but since it's not simple to compare php version, for now we just skip it + if ($source === 'ext-imap') { + logger()->debug("Source [ext-imap] already extracted in {$check}, skip !"); continue; } diff --git a/src/SPC/util/SPCConfigUtil.php b/src/SPC/util/SPCConfigUtil.php index fec3c0895..96c09b48d 100644 --- a/src/SPC/util/SPCConfigUtil.php +++ b/src/SPC/util/SPCConfigUtil.php @@ -145,6 +145,9 @@ private function getLibsString(array $libraries, bool $withDependencies = false) } } } + if (in_array('imap', $libraries) && SPCTarget::getLibc() === 'glibc') { + $short_name[] = '-lcrypt'; + } return implode(' ', $short_name); } diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php index 86b53b8dc..ffb037011 100644 --- a/src/globals/test-extensions.php +++ b/src/globals/test-extensions.php @@ -23,17 +23,17 @@ $test_os = [ // 'macos-13', // bin/spc for x86_64 // 'macos-14', // bin/spc for arm64 - 'macos-15', // bin/spc for arm64 + // 'macos-15', // bin/spc for arm64 'ubuntu-latest', // bin/spc-alpine-docker for x86_64 - 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64 - 'ubuntu-24.04', // bin/spc for x86_64 + // 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64 + // 'ubuntu-24.04', // bin/spc for x86_64 // 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64 // 'ubuntu-24.04-arm', // bin/spc for arm64 // 'windows-latest', // .\bin\spc.ps1 ]; // whether enable thread safe -$zts = true; +$zts = false; $no_strip = false; @@ -44,17 +44,17 @@ $frankenphp = false; // prefer downloading pre-built packages to speed up the build process -$prefer_pre_built = true; +$prefer_pre_built = false; // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`). $extensions = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'curl', + 'Linux', 'Darwin' => 'imap,swoole', 'Windows' => 'intl', }; // If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`). $shared_extensions = match (PHP_OS_FAMILY) { - 'Linux' => 'uv', + 'Linux' => '', 'Darwin' => '', 'Windows' => '', }; @@ -72,7 +72,7 @@ // You can use `common`, `bulk`, `minimal` or `none`. // note: combination is only available for *nix platform. Windows must use `none` combination $base_combination = match (PHP_OS_FAMILY) { - 'Linux', 'Darwin' => 'common', + 'Linux', 'Darwin' => 'minimal', 'Windows' => 'none', };