crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-18 04:44:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

don't build iconv program, or gettext programs

Browse Source
This commit is contained in:
henderkes 2025-10-23 22:14:57 +02:00
parent 8e50af3a7e
commit ef5e664981
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SPC/builder/unix/library/gettext.php
View File

@ -31,7 +31,7 @@ trait gettext
$autoconf->addConfigureArgs('--disable-threads'); $autoconf->addConfigureArgs('--disable-threads');
} }
$autoconf->configure()->make(); $autoconf->configure()->make(dir: $this->getSourceDir() . '/gettext-runtime/intl');
$this->patchLaDependencyPrefix(); $this->patchLaDependencyPrefix();
} }
} }

8
src/SPC/builder/unix/library/libiconv.php
View File

@ -10,7 +10,13 @@ trait libiconv
{ {
protected function build(): void protected function build(): void
{ {
UnixAutoconfExecutor::create($this)->configure('--enable-extra-encodings')->make(); UnixAutoconfExecutor::create($this)
->configure(
'--enable-extra-encodings',
'--enable-year2038',
)
->make('install-lib', with_install: false)
->make('install-lib', with_install: false, dir: $this->getSourceDir() . '/libcharset');
$this->patchLaDependencyPrefix(); $this->patchLaDependencyPrefix();
} }
} }

16
src/SPC/util/executor/UnixAutoconfExecutor.php
View File

@ -50,18 +50,22 @@ class UnixAutoconfExecutor extends Executor
* @param bool $with_clean Whether to clean before building * @param bool $with_clean Whether to clean before building
* @param array $after_env_vars Environment variables postfix * @param array $after_env_vars Environment variables postfix
*/ */
public function make(string $target = '', false|string $with_install = 'install', bool $with_clean = true, array $after_env_vars = []): static public function make(string $target = '', false|string $with_install = 'install', bool $with_clean = true, array $after_env_vars = [], ?string $dir = null): static
{ {
return $this->seekLogFileOnException(function () use ($target, $with_install, $with_clean, $after_env_vars) { return $this->seekLogFileOnException(function () use ($target, $with_install, $with_clean, $after_env_vars, $dir) {
$shell = $this->shell;
if ($dir) {
$shell = $shell->cd($dir);
}
if ($with_clean) { if ($with_clean) {
$this->shell->exec('make clean'); $shell->exec('make clean');
} }
$after_env_vars_str = $after_env_vars !== [] ? shell()->setEnv($after_env_vars)->getEnvString() : ''; $after_env_vars_str = $after_env_vars !== [] ? shell()->setEnv($after_env_vars)->getEnvString() : '';
$this->shell->exec("make -j{$this->library->getBuilder()->concurrency} {$target} {$after_env_vars_str}"); $shell->exec("make -j{$this->library->getBuilder()->concurrency} {$target} {$after_env_vars_str}");
if ($with_install !== false) { if ($with_install !== false) {
$this->shell->exec("make {$with_install}"); $shell->exec("make {$with_install}");
} }
return $this->shell; return $shell;
}); });
} }

1
src/SPC/util/shell/UnixShell.php
View File

@ -29,6 +29,7 @@ class UnixShell extends Shell
public function exec(string $cmd): static public function exec(string $cmd): static
{ {
$cmd = clean_spaces($cmd);
/* @phpstan-ignore-next-line */ /* @phpstan-ignore-next-line */
logger()->info(ConsoleColor::yellow('[EXEC] ') . ConsoleColor::green($cmd)); logger()->info(ConsoleColor::yellow('[EXEC] ') . ConsoleColor::green($cmd));
$original_command = $cmd; $original_command = $cmd;