diff --git a/src/SPC/builder/extension/decimal.php b/src/SPC/builder/extension/decimal.php index 795bce2d2..eab3fdce8 100644 --- a/src/SPC/builder/extension/decimal.php +++ b/src/SPC/builder/extension/decimal.php @@ -16,8 +16,14 @@ public function patchBeforeBuildconf(): bool { FileSystem::replaceFileStr( $this->source_dir . '/php_decimal.c', - 'zend_module_entry decimal_module_entry', - 'zend_module_entry php_decimal_module_entry' + [ + 'zend_module_entry decimal_module_entry', + 'ZEND_GET_MODULE(decimal)', + ], + [ + 'zend_module_entry php_decimal_module_entry', + 'ZEND_GET_MODULE(php_decimal)', + ] ); FileSystem::replaceFileStr( $this->source_dir . '/config.w32', diff --git a/src/SPC/builder/unix/library/krb5.php b/src/SPC/builder/unix/library/krb5.php index 4cf0ad44e..85110e252 100644 --- a/src/SPC/builder/unix/library/krb5.php +++ b/src/SPC/builder/unix/library/krb5.php @@ -4,6 +4,8 @@ namespace SPC\builder\unix\library; +use SPC\toolchain\ToolchainManager; +use SPC\toolchain\ZigToolchain; use SPC\util\executor\UnixAutoconfExecutor; use SPC\util\SPCConfigUtil; @@ -39,12 +41,16 @@ protected function build(): void $extraEnv['LDFLAGS'] = '-framework Kerberos'; $args[] = 'ac_cv_func_secure_getenv=no'; } - UnixAutoconfExecutor::create($this) + $make = UnixAutoconfExecutor::create($this) ->appendEnv($extraEnv) ->optionalLib('ldap', '--with-ldap', '--without-ldap') ->optionalLib('libedit', '--with-libedit', '--without-libedit') - ->configure(...$args) - ->make(); + ->configure(...$args); + + if (ToolchainManager::getToolchainClass() === ZigToolchain::class) { + $make->exec('find . -name Makefile -exec sed -i "s/-Werror=incompatible-pointer-types//g" {} +'); + } + $make->make(); $this->patchPkgconfPrefix([ 'krb5-gssapi.pc', 'krb5.pc',