From 01607a06c99bc02e5944161411b699f1d3a22731 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Fri, 8 May 2026 22:32:50 +0800 Subject: [PATCH] Add spx compatible command arg --- src/Package/Extension/zlib.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Package/Extension/zlib.php b/src/Package/Extension/zlib.php index 14ab656d..d04c00a0 100644 --- a/src/Package/Extension/zlib.php +++ b/src/Package/Extension/zlib.php @@ -8,15 +8,16 @@ use Package\Target\php; use StaticPHP\Attribute\Package\CustomPhpConfigureArg; use StaticPHP\Attribute\Package\Extension; use StaticPHP\Package\PackageBuilder; +use StaticPHP\Package\PackageInstaller; #[Extension('zlib')] class zlib { #[CustomPhpConfigureArg('Darwin')] #[CustomPhpConfigureArg('Linux')] - public function unixConfigureArg(PackageBuilder $builder): string + public function unixConfigureArg(PackageBuilder $builder, PackageInstaller $installer): string { - $zlib_dir = php::getPHPVersionID() >= 80400 ? '' : ' --with-zlib-dir=' . $builder->getBuildRootPath(); - return '--with-zlib' . $zlib_dir; + $zlib_dir = (php::getPHPVersionID() >= 80400 && !$installer->getPhpExtensionPackage('spx')) ? '' : " --with-zlib-dir={$builder->getBuildRootPath()}"; + return "--with-zlib{$zlib_dir}"; } }