don't build avx2 if we don't have it

This commit is contained in:
henderkes 2025-12-01 16:55:52 +01:00
parent 7204d277b4
commit 14b822a185
2 changed files with 17 additions and 8 deletions

View File

@ -29,13 +29,17 @@ trait libjxl
); );
if (ToolchainManager::getToolchainClass() === ZigToolchain::class) { if (ToolchainManager::getToolchainClass() === ZigToolchain::class) {
$cmake->addConfigureArgs( $cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
'-DCXX_MAVX512F_SUPPORTED:BOOL=FALSE', $has_avx512 = str_contains($cflags, '-mavx512') || str_contains($cflags, '-march=x86-64-v4');
'-DCXX_MAVX512DQ_SUPPORTED:BOOL=FALSE', if (!$has_avx512) {
'-DCXX_MAVX512CD_SUPPORTED:BOOL=FALSE', $cmake->addConfigureArgs(
'-DCXX_MAVX512BW_SUPPORTED:BOOL=FALSE', '-DCXX_MAVX512F_SUPPORTED:BOOL=FALSE',
'-DCXX_MAVX512VL_SUPPORTED:BOOL=FALSE' '-DCXX_MAVX512DQ_SUPPORTED:BOOL=FALSE',
); '-DCXX_MAVX512CD_SUPPORTED:BOOL=FALSE',
'-DCXX_MAVX512BW_SUPPORTED:BOOL=FALSE',
'-DCXX_MAVX512VL_SUPPORTED:BOOL=FALSE'
);
}
} }
$cmake->build(); $cmake->build();

View File

@ -10,8 +10,13 @@ trait libwebp
{ {
protected function build(): void protected function build(): void
{ {
$cflags = getenv('SPC_DEFAULT_C_FLAGS') ?: getenv('CFLAGS') ?: '';
$has_avx2 = str_contains($cflags, '-mavx2') || str_contains($cflags, '-march=x86-64-v2') || str_contains($cflags, '-march=x86-64-v3');
UnixCMakeExecutor::create($this) UnixCMakeExecutor::create($this)
->addConfigureArgs('-DWEBP_BUILD_EXTRAS=ON') ->addConfigureArgs(
'-DWEBP_BUILD_EXTRAS=ON',
'-DWEBP_ENABLE_SIMD=' . ($has_avx2 ? 'ON' : 'OFF'),
)
->build(); ->build();
// patch pkgconfig // patch pkgconfig
$this->patchPkgconfPrefix(patch_option: PKGCONF_PATCH_PREFIX | PKGCONF_PATCH_LIBDIR); $this->patchPkgconfPrefix(patch_option: PKGCONF_PATCH_PREFIX | PKGCONF_PATCH_LIBDIR);