Skip to content

Commit 3357f28

Browse files
committed
Remove libgomp deps
1 parent 604131b commit 3357f28

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

src/SPC/builder/extension/imagick.php

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,9 @@
1111
#[CustomExt('imagick')]
1212
class imagick extends Extension
1313
{
14-
public function patchBeforeMake(): bool
15-
{
16-
if (PHP_OS_FAMILY !== 'Linux') {
17-
return false;
18-
}
19-
if (SPCTarget::isTarget(SPCTarget::GLIBC)) {
20-
return false;
21-
}
22-
// imagick with calls omp_pause_all, which requires openmp, on non-musl we build imagick without openmp
23-
$extra_libs = trim(getenv('SPC_EXTRA_LIBS') . ' -lgomp');
24-
f_putenv('SPC_EXTRA_LIBS=' . $extra_libs);
25-
return true;
26-
}
27-
2814
public function getUnixConfigureArg(bool $shared = false): string
2915
{
30-
$disable_omp = SPCTarget::isTarget(SPCTarget::GLIBC) ? ' ac_cv_func_omp_pause_resource_all=no' : '';
16+
$disable_omp = ' ac_cv_func_omp_pause_resource_all=no';
3117
return '--with-imagick=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . $disable_omp;
3218
}
3319

src/SPC/util/SPCConfigUtil.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,6 @@ private function getLibsString(array $libraries, bool $withDependencies = false)
145145
}
146146
}
147147
}
148-
// patch: imagick (imagemagick wrapper) for linux needs libgomp
149-
if (in_array('imagemagick', $libraries) && !SPCTarget::isTarget(SPCTarget::GLIBC)) {
150-
$short_name[] = '-lgomp';
151-
}
152148
return implode(' ', $short_name);
153149
}
154150

0 commit comments

Comments
 (0)