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/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); } } 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}");