Merge pull request #858 from crazywhalecc/fix/imagick

imagick needs static libstdc++ on gcc-toolset (successor of devtoolse) too
This commit is contained in:
Marc 2025-08-20 07:56:08 +02:00 committed by GitHub
commit 3804e842bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions

View File

@ -694,7 +694,8 @@
"arg-type": "custom", "arg-type": "custom",
"ext-suggests": [ "ext-suggests": [
"session", "session",
"igbinary" "igbinary",
"msgpack"
], ],
"lib-suggests-unix": [ "lib-suggests-unix": [
"zstd", "zstd",

View File

@ -19,7 +19,7 @@ class imagick extends Extension
protected function splitLibsIntoStaticAndShared(string $allLibs): array protected function splitLibsIntoStaticAndShared(string $allLibs): array
{ {
[$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs); [$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs);
if (str_contains(getenv('PATH'), 'rh/devtoolset-10')) { if (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset')) {
$static .= ' -l:libstdc++.a'; $static .= ' -l:libstdc++.a';
$shared = str_replace('-lstdc++', '', $shared); $shared = str_replace('-lstdc++', '', $shared);
} }