Skip to content

Commit 150d866

Browse files
committed
revert turning off sse for libwebp, need to check why debian fails building
1 parent c051a48 commit 150d866

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/SPC/builder/extension/imagick.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ public function getUnixConfigureArg(bool $shared = false): string
2121
protected function splitLibsIntoStaticAndShared(string $allLibs): array
2222
{
2323
[$static, $shared] = parent::splitLibsIntoStaticAndShared($allLibs);
24-
if (ToolchainManager::getToolchainClass() !== ZigToolchain::class && str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset')) {
24+
if (ToolchainManager::getToolchainClass() !== ZigToolchain::class &&
25+
(str_contains(getenv('PATH'), 'rh/devtoolset') || str_contains(getenv('PATH'), 'rh/gcc-toolset'))
26+
) {
2527
$static .= ' -l:libstdc++.a';
2628
$shared = str_replace('-lstdc++', '', $shared);
2729
}

src/SPC/builder/unix/library/libwebp.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,9 @@ trait libwebp
1010
{
1111
protected function build(): void
1212
{
13-
$cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
14-
$has_avx2 = str_contains($cflags, '-mavx2') || str_contains($cflags, '-march=x86-64-v2') || str_contains($cflags, '-march=x86-64-v3');
1513
UnixCMakeExecutor::create($this)
1614
->addConfigureArgs(
17-
'-DWEBP_BUILD_EXTRAS=OFF',
18-
'-DWEBP_ENABLE_SIMD=' . ($has_avx2 ? 'ON' : 'OFF'),
15+
'-DWEBP_BUILD_EXTRAS=OFF'
1916
)
2017
->build();
2118
// patch pkgconfig

0 commit comments

Comments
 (0)