From b9dfb5afe304862963458a1f6e1e63c26f15132f Mon Sep 17 00:00:00 2001 From: henderkes Date: Wed, 8 Oct 2025 10:17:14 +0200 Subject: [PATCH] maybe better this way --- src/SPC/builder/extension/readline.php | 4 ++-- src/SPC/builder/linux/LinuxBuilder.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SPC/builder/extension/readline.php b/src/SPC/builder/extension/readline.php index fdfa87c6..b9afd4f9 100644 --- a/src/SPC/builder/extension/readline.php +++ b/src/SPC/builder/extension/readline.php @@ -36,9 +36,9 @@ class readline extends Extension parent::buildUnixShared(); } - public static function patchCliLinux(bool $revert = false): void + public static function patchCliLinux(bool $patch): void { - if (SPCTarget::getTargetOS() === 'Linux' && SPCTarget::isStatic() && !$revert) { + if (SPCTarget::getTargetOS() === 'Linux' && SPCTarget::isStatic() && $patch) { FileSystem::replaceFileStr( SOURCE_PATH . '/php-src/ext/readline/readline_cli.c', "/*#else\n#define GET_SHELL_CB(cb) (cb) = php_cli_get_shell_callbacks()", diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php index 5620b6ee..17bb1c5e 100644 --- a/src/SPC/builder/linux/LinuxBuilder.php +++ b/src/SPC/builder/linux/LinuxBuilder.php @@ -171,12 +171,12 @@ class LinuxBuilder extends UnixBuilderBase protected function buildCli(): void { $vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars()); - readline::patchCliLinux(); + readline::patchCliLinux(true); $SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make'; shell()->cd(SOURCE_PATH . '/php-src') ->exec('sed -i "s|//lib|/lib|g" Makefile') ->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cli"); - readline::patchCliLinux(true); + readline::patchCliLinux(false); if (!$this->getOption('no-strip', false)) { shell()->cd(SOURCE_PATH . '/php-src/sapi/cli')->exec('strip --strip-unneeded php');