From dd72b32559600cc2aad2c3f311954a117a4b0944 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Thu, 10 Jul 2025 12:59:27 +0800 Subject: [PATCH] Merge --- src/SPC/builder/LibraryBase.php | 9 +++++++++ src/SPC/builder/extension/imap.php | 11 +++++++++++ src/SPC/builder/linux/library/imap.php | 16 +++++++++++++--- src/SPC/builder/unix/UnixBuilderBase.php | 5 +++++ src/SPC/store/SourceManager.php | 11 +++++++++-- src/SPC/util/SPCConfigUtil.php | 3 +++ 6 files changed, 50 insertions(+), 5 deletions(-) diff --git a/src/SPC/builder/LibraryBase.php b/src/SPC/builder/LibraryBase.php index fc6adefc..b97b5929 100644 --- a/src/SPC/builder/LibraryBase.php +++ b/src/SPC/builder/LibraryBase.php @@ -332,6 +332,15 @@ abstract class LibraryBase 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 9cc9a87f..f36ffb1e 100644 --- a/src/SPC/builder/extension/imap.php +++ b/src/SPC/builder/extension/imap.php @@ -5,6 +5,7 @@ declare(strict_types=1); 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 @@ class imap extends Extension } 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 781529c6..8203928d 100644 --- a/src/SPC/builder/linux/library/imap.php +++ b/src/SPC/builder/linux/library/imap.php @@ -7,6 +7,7 @@ namespace SPC\builder\linux\library; use SPC\exception\FileSystemException; use SPC\exception\RuntimeException; use SPC\store\FileSystem; +use SPC\util\SPCTarget; class imap extends LinuxLibraryBase { @@ -34,6 +35,15 @@ class imap extends LinuxLibraryBase 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 @@ class imap extends LinuxLibraryBase } 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 @@ class imap extends LinuxLibraryBase ->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 6f0d5045..f0e4e169 100644 --- a/src/SPC/builder/unix/UnixBuilderBase.php +++ b/src/SPC/builder/unix/UnixBuilderBase.php @@ -294,6 +294,11 @@ abstract class UnixBuilderBase extends BuilderBase $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 02d07263..251e2fa1 100644 --- a/src/SPC/store/SourceManager.php +++ b/src/SPC/store/SourceManager.php @@ -66,7 +66,7 @@ class SourceManager $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 @@ class SourceManager // 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 fec3c089..96c09b48 100644 --- a/src/SPC/util/SPCConfigUtil.php +++ b/src/SPC/util/SPCConfigUtil.php @@ -145,6 +145,9 @@ class SPCConfigUtil } } } + if (in_array('imap', $libraries) && SPCTarget::getLibc() === 'glibc') { + $short_name[] = '-lcrypt'; + } return implode(' ', $short_name); }