Skip to content

Commit a4b6499

Browse files
authored
Fix libevent build, use newer cmake options (#945)
2 parents 72ca0ce + be51bcf commit a4b6499

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/SPC/doctor/item/LinuxToolCheckList.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ public function checkCliTools(): ?CheckResult
8282
return CheckResult::ok();
8383
}
8484

85-
#[AsCheckItem('if cmake version >= 3.18', limit_os: 'Linux')]
85+
#[AsCheckItem('if cmake version >= 3.22', limit_os: 'Linux')]
8686
public function checkCMakeVersion(): ?CheckResult
8787
{
8888
$ver = get_cmake_version();
8989
if ($ver === null) {
9090
return CheckResult::fail('Failed to get cmake version');
9191
}
92-
if (version_compare($ver, '3.18.0') < 0) {
92+
if (version_compare($ver, '3.22.0') < 0) {
9393
return CheckResult::fail('cmake version is too low (' . $ver . '), please update it manually!');
9494
}
9595
return CheckResult::ok($ver);

src/SPC/util/executor/UnixCMakeExecutor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ private function makeCmakeToolchainFile(): string
205205
SET(CMAKE_INSTALL_LIBDIR "lib")
206206
207207
set(PKG_CONFIG_EXECUTABLE "{$pkgConfigExecutable}")
208-
list(APPEND PKG_CONFIG_EXECUTABLE "--static")
208+
set(PKG_CONFIG_ARGN "--static" CACHE STRING "Extra arguments for pkg-config" FORCE)
209209
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
210210
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
211211
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

src/globals/test-extensions.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
// test php version (8.1 ~ 8.4 available, multiple for matrix)
1515
$test_php_version = [
16-
// '8.1',
16+
'8.1',
1717
// '8.2',
1818
// '8.3',
19-
'8.4',
19+
// '8.4',
2020
// '8.5',
2121
// 'git',
2222
];
@@ -25,7 +25,7 @@
2525
$test_os = [
2626
'macos-15-intel', // bin/spc for x86_64
2727
'macos-15', // bin/spc for arm64
28-
// 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
28+
'ubuntu-latest', // bin/spc-alpine-docker for x86_64
2929
'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
3030
'ubuntu-24.04', // bin/spc for x86_64
3131
'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
@@ -49,14 +49,14 @@
4949

5050
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
5151
$extensions = match (PHP_OS_FAMILY) {
52-
'Linux', 'Darwin' => 'spx',
52+
'Linux', 'Darwin' => 'event',
5353
'Windows' => 'bcmath,bz2,calendar,ctype,curl,dom,exif,fileinfo,filter,ftp,iconv,xml,mbstring,mbregex,mysqlnd,openssl,pdo,pdo_mysql,pdo_sqlite,phar,session,simplexml,soap,sockets,sqlite3,tokenizer,xmlwriter,xmlreader,zlib,zip',
5454
};
5555

5656
// If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).
5757
$shared_extensions = match (PHP_OS_FAMILY) {
58-
'Linux' => 'mysqli',
59-
'Darwin' => 'zip',
58+
'Linux' => '',
59+
'Darwin' => '',
6060
'Windows' => '',
6161
};
6262

0 commit comments

Comments
 (0)