Fix linux imagick openmp linking issue (#424)

crazywhalecc · Apr 26, 2024 · aaa4510 · aaa4510
1 parent b14894f
commit aaa4510
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/SPC/builder/extension/imagick.php b/src/SPC/builder/extension/imagick.php
@@ -14,11 +14,11 @@ class imagick extends Extension
     public function patchBeforeMake(): bool
     {
         // imagick may call omp_pause_all which requires -lgomp
-        $extra_libs = $this->builder->getOption('extra-libs', '');
+        $extra_libs = getenv('SPC_EXTRA_LIBS') ?: '';
         if ($this->builder instanceof LinuxBuilder) {
-            $extra_libs .= ' -lgomp ';
+            $extra_libs .= (empty($extra_libs) ? '' : ' ') . '-lgomp ';
         }
-        $this->builder->setOption('extra-libs', $extra_libs);
+        f_putenv('SPC_EXTRA_LIBS=' . $extra_libs);
         return true;
     }
 

diff --git a/src/SPC/builder/unix/library/imagemagick.php b/src/SPC/builder/unix/library/imagemagick.php
@@ -19,7 +19,7 @@ trait imagemagick
     protected function build(): void
     {
         // TODO: imagemagick build with bzip2 failed with bugs, we need to fix it in the future
-        $extra = '--without-jxl --without-x --disable-openmp --without-bzlib ';
+        $extra = '--without-jxl --without-x --enable-openmp --without-bzlib ';
         $required_libs = '';
         $optional_libs = [
             'libzip' => 'zip',

diff --git a/src/globals/test-extensions.php b/src/globals/test-extensions.php
@@ -13,8 +13,8 @@
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'intl,posix',
-    'Windows' => 'mbstring,pdo_sqlite,mbregex,curl',
+    'Linux', 'Darwin' => 'imagick',
+    'Windows' => 'mbstring,pdo_sqlite,mbregex',
 };
 
 // If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).