From 17ff4f1add52841e19d72d47a1fa91ea42dd4410 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 15 Nov 2026 23:39:21 +0800 Subject: [PATCH 1/2] fix(attr): serialize installation of attributes.h to avoid race conditions --- src/Package/Library/attr.php | 2 +- .../Runtime/Executor/UnixAutoconfExecutor.php | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Package/Library/attr.php b/src/Package/Library/attr.php index 40637e80a..b4671d01f 100644 --- a/src/Package/Library/attr.php +++ b/src/Package/Library/attr.php @@ -23,7 +23,7 @@ public function build(LibraryPackage $lib): void ->exec('libtoolize --force --copy') ->exec('./autogen.sh || autoreconf -if') ->configure('--disable-nls') - ->make('install-attributes_h install-data install-libattr_h install-libLTLIBRARIES install-pkgincludeHEADERS install-pkgconfDATA', with_install: false); + ->make('install-attributes_h install-data install-libattr_h install-libLTLIBRARIES install-pkgincludeHEADERS install-pkgconfDATA', with_install: false, concurrency: 1); $lib->patchPkgconfPrefix(['libattr.pc'], PKGCONF_PATCH_PREFIX); } } diff --git a/src/StaticPHP/Runtime/Executor/UnixAutoconfExecutor.php b/src/StaticPHP/Runtime/Executor/UnixAutoconfExecutor.php index 84d3ca07e..259fbc040 100644 --- a/src/StaticPHP/Runtime/Executor/UnixAutoconfExecutor.php +++ b/src/StaticPHP/Runtime/Executor/UnixAutoconfExecutor.php @@ -63,9 +63,15 @@ public function configure(...$args): static * @param bool $with_clean Whether to clean before building * @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 = [], ?string $dir = null): static - { - return $this->seekLogFileOnException(function () use ($target, $with_install, $with_clean, $after_env_vars, $dir) { + public function make( + string $target = '', + false|string $with_install = 'install', + bool $with_clean = true, + array $after_env_vars = [], + ?string $dir = null, + ?int $concurrency = null + ): static { + return $this->seekLogFileOnException(function () use ($target, $with_install, $with_clean, $after_env_vars, $dir, $concurrency) { $shell = $this->shell; if ($dir) { $shell = $shell->cd($dir); @@ -75,9 +81,9 @@ public function make(string $target = '', false|string $with_install = 'install' $shell->exec('make clean'); } $after_env_vars_str = $after_env_vars !== [] ? shell()->setEnv($after_env_vars)->getEnvString() : ''; - $concurrency = ApplicationContext::get(PackageBuilder::class)->concurrency; + $c = $concurrency ?? ApplicationContext::get(PackageBuilder::class)->concurrency; InteractiveTerm::setMessage('Building package: ' . ConsoleColor::yellow($this->package->getName()) . ' (make)'); - $shell->exec("make -j{$concurrency} {$target} {$after_env_vars_str}"); + $shell->exec("make -j{$c} {$target} {$after_env_vars_str}"); if ($with_install !== false) { InteractiveTerm::setMessage('Building package: ' . ConsoleColor::yellow($this->package->getName()) . ' (make ' . $with_install . ')'); $shell->exec("make {$with_install}"); From e0a24beb2c2f0217a3cbf3885eee9908bcb7eb82 Mon Sep 17 00:00:00 2001 From: henderkes <7896469+henderkes@users.noreply.github.com> Date: Sun, 15 Nov 2026 15:45:58 +0000 Subject: [PATCH 2/2] fix(libacl): serialize install command Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- src/Package/Library/libacl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Package/Library/libacl.php b/src/Package/Library/libacl.php index 97c57d39f..7358d1b48 100644 --- a/src/Package/Library/libacl.php +++ b/src/Package/Library/libacl.php @@ -36,7 +36,7 @@ public function buildUnix(LibraryPackage $lib): void ->exec('libtoolize --force --copy') ->exec('./autogen.sh || autoreconf -if') ->configure('--disable-nls', '--disable-tests') - ->make('install-acl_h install-libacl_h install-data install-libLTLIBRARIES install-pkgincludeHEADERS install-sysincludeHEADERS install-pkgconfDATA', with_install: false); + ->make('install-acl_h install-libacl_h install-data install-libLTLIBRARIES install-pkgincludeHEADERS install-sysincludeHEADERS install-pkgconfDATA', with_install: false, concurrency: 1); $lib->patchPkgconfPrefix(['libacl.pc'], PKGCONF_PATCH_PREFIX); } }