diff --git a/src/SPC/builder/Extension.php b/src/SPC/builder/Extension.php index f6e3508d..d1d1ebb8 100644 --- a/src/SPC/builder/Extension.php +++ b/src/SPC/builder/Extension.php @@ -193,7 +193,7 @@ class Extension * If you need to patch some code, overwrite this * return true if you patched something, false if not */ - public function patchBeforeSharedBuild(): bool + public function patchBeforeSharedPhpize(): bool { return false; } @@ -394,13 +394,17 @@ class Extension 'LD_LIBRARY_PATH' => BUILD_LIB_PATH, ]; + if ($this->patchBeforeSharedPhpize()) { + logger()->info("Extension [{$this->getName()}] patched before shared phpize"); + } + // prepare configure args shell()->cd($this->source_dir) ->setEnv($env) ->exec(BUILD_BIN_PATH . '/phpize'); if ($this->patchBeforeSharedConfigure()) { - logger()->info('ext [' . $this->getName() . '] patching before shared configure'); + logger()->info("Extension [{$this->getName()}] patched before shared configure"); } shell()->cd($this->source_dir) @@ -419,7 +423,7 @@ class Extension ); if ($this->patchBeforeSharedMake()) { - logger()->info('ext [' . $this->getName() . '] patching before shared make'); + logger()->info("Extension [{$this->getName()}] patched before shared make"); } shell()->cd($this->source_dir) diff --git a/src/SPC/builder/extension/intl.php b/src/SPC/builder/extension/intl.php index 5676a489..56ce1c61 100644 --- a/src/SPC/builder/extension/intl.php +++ b/src/SPC/builder/extension/intl.php @@ -22,7 +22,7 @@ class intl extends Extension return true; } - public function patchBeforeSharedBuild(): bool + public function patchBeforeSharedPhpize(): bool { return $this->patchBeforeBuildconf(); } diff --git a/src/SPC/command/BuildPHPCommand.php b/src/SPC/command/BuildPHPCommand.php index 8c4c7233..2604a7b6 100644 --- a/src/SPC/command/BuildPHPCommand.php +++ b/src/SPC/command/BuildPHPCommand.php @@ -207,8 +207,6 @@ class BuildPHPCommand extends BuildCommand // start to build $builder->buildPHP($rule); - SourcePatcher::patchBeforeSharedBuild($builder); - // build dynamic extensions if needed if (!empty($shared_extensions)) { logger()->info('Building shared extensions ...'); diff --git a/src/SPC/store/SourcePatcher.php b/src/SPC/store/SourcePatcher.php index 11317314..1b5604c3 100644 --- a/src/SPC/store/SourcePatcher.php +++ b/src/SPC/store/SourcePatcher.php @@ -46,12 +46,12 @@ class SourcePatcher { foreach ($builder->getExts() as $ext) { if ($ext->patchBeforeBuildconf() === true) { - logger()->info('Extension [' . $ext->getName() . '] patched before buildconf'); + logger()->info("Extension [{$ext->getName()}] patched before buildconf"); } } foreach ($builder->getLibs() as $lib) { if ($lib->patchBeforeBuildconf() === true) { - logger()->info('Library [' . $lib->getName() . '] patched before buildconf'); + logger()->info("Library [{$lib->getName()}]patched before buildconf"); } } // patch windows php 8.1 bug @@ -79,15 +79,6 @@ class SourcePatcher } } - public static function patchBeforeSharedBuild(BuilderBase $builder): void - { - foreach ($builder->getExts() as $ext) { - if ($ext->patchBeforeSharedBuild() === true) { - logger()->info('Extension [' . $ext->getName() . '] patched before shared build'); - } - } - } - /** * Source patcher runner before configure * @@ -98,12 +89,12 @@ class SourcePatcher { foreach ($builder->getExts() as $ext) { if ($ext->patchBeforeConfigure() === true) { - logger()->info('Extension [' . $ext->getName() . '] patched before configure'); + logger()->info("Extension [{$ext->getName()}] patched before configure"); } } foreach ($builder->getLibs() as $lib) { if ($lib->patchBeforeConfigure() === true) { - logger()->info('Library [' . $lib->getName() . '] patched before configure'); + logger()->info("Library [{$lib->getName()}] patched before configure"); } } // patch capstone @@ -279,12 +270,12 @@ class SourcePatcher // call extension patch before make foreach ($builder->getExts(false) as $ext) { if ($ext->patchBeforeMake() === true) { - logger()->info('Extension [' . $ext->getName() . '] patched before make'); + logger()->info("Extension [{$ext->getName()}] patched before make"); } } foreach ($builder->getLibs() as $lib) { if ($lib->patchBeforeMake() === true) { - logger()->info('Library [' . $lib->getName() . '] patched before make'); + logger()->info("Library [{$lib->getName()}] patched before make"); } } }