Skip to content

Commit 3804e84

Browse files
authored
Merge pull request #858 from crazywhalecc/fix/imagick
imagick needs static libstdc++ on gcc-toolset (successor of devtoolse) too
2 parents 6b5aaa3 + e6832ec commit 3804e84

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

config/ext.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,8 @@
694694
"arg-type": "custom",
695695
"ext-suggests": [
696696
"session",
697-
"igbinary"
697+
"igbinary",
698+
"msgpack"
698699
],
699700
"lib-suggests-unix": [
700701
"zstd",

src/SPC/builder/extension/imagick.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public function getUnixConfigureArg(bool $shared = false): string
1919
protected function splitLibsIntoStaticAndShared(string $allLibs): array
2020
{
2121
[$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs);
22-
if (str_contains(getenv('PATH'), 'rh/devtoolset-10')) {
22+
if (str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset')) {
2323
$static .= ' -l:libstdc++.a';
2424
$shared = str_replace('-lstdc++', '', $shared);
2525
}

0 commit comments

Comments
 (0)