forward port #1138

This commit is contained in:
henderkes
2026-05-15 14:39:15 +07:00
parent 1707d21569
commit 4b19f4ec95
2 changed files with 2 additions and 1 deletions

View File

@@ -186,6 +186,7 @@ ext-password-argon2:
type: php-extension type: php-extension
depends: depends:
- libargon2 - libargon2
suggests:
- ext-openssl - ext-openssl
php-extension: php-extension:
os: os:

View File

@@ -27,7 +27,7 @@ class password_argon2 extends PhpExtensionPackage
#[CustomPhpConfigureArg('Darwin')] #[CustomPhpConfigureArg('Darwin')]
public function getConfigureArg(PackageInstaller $installer, PackageBuilder $builder): string public function getConfigureArg(PackageInstaller $installer, PackageBuilder $builder): string
{ {
if ($installer->getLibraryPackage('openssl') !== null) { if ($installer->getPhpExtensionPackage('openssl')?->isBuildStatic() || $this->isBuildShared()) {
if (php::getPHPVersionID() >= 80500 || (php::getPHPVersionID() >= 80400 && !$builder->getOption('enable-zts'))) { if (php::getPHPVersionID() >= 80500 || (php::getPHPVersionID() >= 80400 && !$builder->getOption('enable-zts'))) {
return '--without-password-argon2'; // use --with-openssl-argon2 in openssl extension instead return '--without-password-argon2'; // use --with-openssl-argon2 in openssl extension instead
} }