diff --git a/src/SPC/builder/Extension.php b/src/SPC/builder/Extension.php index d8db6d07..8a3759fe 100644 --- a/src/SPC/builder/Extension.php +++ b/src/SPC/builder/Extension.php @@ -229,7 +229,7 @@ class Extension public function patchBeforeSharedMake(): bool { $config = (new SPCConfigUtil($this->builder))->config([$this->getName()], array_map(fn ($l) => $l->getName(), $this->builder->getLibs())); - [$staticLibs] = $this->getStaticAndSharedLibs($config['libs']); + [$staticLibs] = $this->splitLibsIntoStaticAndShared($config['libs']); FileSystem::replaceFileRegex( $this->source_dir . '/Makefile', '/^(.*_SHARED_LIBADD\s*=.*)$/m', @@ -408,7 +408,7 @@ class Extension public function buildUnixShared(): void { $config = (new SPCConfigUtil($this->builder))->config([$this->getName()], array_map(fn ($l) => $l->getName(), $this->builder->getLibs())); - [$staticLibs, $sharedLibs] = $this->getStaticAndSharedLibs($config['libs']); + [$staticLibs, $sharedLibs] = $this->splitLibsIntoStaticAndShared($config['libs']); $env = [ 'CFLAGS' => $config['cflags'], 'CXXFLAGS' => $config['cflags'], @@ -528,7 +528,7 @@ class Extension return []; } - protected function getStaticAndSharedLibs(string $allLibs): array + protected function splitLibsIntoStaticAndShared(string $allLibs): array { $staticLibString = ''; $sharedLibString = ''; diff --git a/src/SPC/builder/extension/imagick.php b/src/SPC/builder/extension/imagick.php index 0471dd65..cd5542cf 100644 --- a/src/SPC/builder/extension/imagick.php +++ b/src/SPC/builder/extension/imagick.php @@ -16,9 +16,9 @@ class imagick extends Extension return '--with-imagick=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . $disable_omp; } - protected function getStaticAndSharedLibs(string $allLibs): array + protected function splitLibsIntoStaticAndShared(string $allLibs): array { - [$static, $shared] = parent::getStaticAndSharedLibs($allLibs); + [$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs); if (str_contains(getenv('PATH'), 'rh/devtoolset-10')) { $static .= ' -l:libstdc++.a'; $shared = str_replace('-lstdc++', '', $shared);