Skip to content

Commit 38731d1

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/ext-imap-extraction
2 parents e5fee25 + 1a42963 commit 38731d1

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ protected function build(): void
2424
->optionalLib('libssh2', fn ($lib) => "-DLIBSSH2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DLIBSSH2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DCURL_USE_LIBSSH2=OFF')
2525
->optionalLib('nghttp2', fn ($lib) => "-DUSE_NGHTTP2=ON -DNGHTTP2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DNGHTTP2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DUSE_NGHTTP2=OFF')
2626
->optionalLib('nghttp3', fn ($lib) => "-DUSE_NGHTTP3=ON -DNGHTTP3_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DNGHTTP3_INCLUDE_DIR={$lib->getIncludeDir()}", '-DUSE_NGHTTP3=OFF')
27+
->optionalLib('ngtcp2', fn ($lib) => "-DUSE_NGTCP2=ON -DNGNGTCP2_LIBRARY=\"{$lib->getStaticLibFiles(style: 'cmake')}\" -DNGNGTCP2_INCLUDE_DIR={$lib->getIncludeDir()}", '-DUSE_NGTCP2=OFF')
2728
->optionalLib('ldap', ...cmake_boolean_args('CURL_DISABLE_LDAP', true))
2829
->optionalLib('zstd', ...cmake_boolean_args('CURL_ZSTD'))
2930
->optionalLib('idn2', ...cmake_boolean_args('USE_LIBIDN2'))

src/SPC/doctor/item/LinuxToolCheckList.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public function checkCliTools(): ?CheckResult
6161

6262
$required = match ($distro['dist']) {
6363
'alpine' => self::TOOLS_ALPINE,
64-
'redhat', 'centos' => self::TOOLS_RHEL,
64+
'redhat' => self::TOOLS_RHEL,
65+
'centos' => array_merge(self::TOOLS_RHEL, ['perl-IPC-Cmd']),
6566
'arch' => self::TOOLS_ARCH,
6667
default => self::TOOLS_DEBIAN,
6768
};

0 commit comments

Comments
 (0)