Skip to content

Commit b52fe05

Browse files
committed
Fix icu missing tool bug
1 parent c40e41c commit b52fe05

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jobs:
176176
177177
- name: "Run Build Tests (download)"
178178
run: |
179-
bin/spc download --for-extensions="$(php src/globals/test-extensions.php extensions)" --for-libs="$(php src/globals/test-extensions.php libs)" --with-php=${{ matrix.php }} --ignore-cache-sources=php-src --debug --retry=5 --shallow-clone --prefer-pre-built
179+
bin/spc download --for-extensions="$(php src/globals/test-extensions.php extensions)" --for-libs="$(php src/globals/test-extensions.php libs)" --with-php=${{ matrix.php }} --ignore-cache-sources=php-src --debug --retry=5 --shallow-clone
180180
181181
- name: "Download pre-built libraries for pkg-config"
182182
if: matrix.os != 'windows-latest'

src/SPC/builder/linux/library/icu.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class icu extends LinuxLibraryBase
1212

1313
protected function build(): void
1414
{
15-
$cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1"';
15+
$cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1"';
1616
$cxxflags = 'CXXFLAGS="-std=c++17"';
1717
$ldflags = 'LDFLAGS="-static"';
1818
shell()->cd($this->source_dir . '/source')
@@ -26,7 +26,7 @@ protected function build(): void
2626
'--enable-extras=no ' .
2727
'--enable-icuio=yes ' .
2828
'--enable-dyload=no ' .
29-
'--enable-tools=no ' .
29+
'--enable-tools=yes ' .
3030
'--enable-tests=no ' .
3131
'--enable-samples=no ' .
3232
'--prefix=' . BUILD_ROOT_PATH

src/SPC/builder/macos/library/icu.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ protected function build(): void
1414
{
1515
$root = BUILD_ROOT_PATH;
1616
shell()->cd($this->source_dir . '/source')
17-
->exec("./runConfigureICU MacOSX --enable-static --disable-shared --disable-extras --disable-samples --disable-tests --disable-tools --prefix={$root}")
17+
->exec("./runConfigureICU MacOSX --enable-static --disable-shared --disable-extras --disable-samples --disable-tests --prefix={$root}")
1818
->exec('make clean')
1919
->exec("make -j{$this->builder->concurrency}")
2020
->exec('make install');

src/globals/test-extensions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919

2020
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
2121
$extensions = match (PHP_OS_FAMILY) {
22-
'Linux', 'Darwin' => 'swoole,bz2,gmp,intl,password-argon2,gd,mbregex,iconv,redis,sodium,yaml,readline,openssl,sqlite3,sqlsrv,zip,zlib',
23-
'Windows' => 'amqp,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,ds,exif,ffi,fileinfo,filter,ftp,gd,iconv,libxml,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_sqlite,pdo_sqlsrv,phar,rar,session,shmop,simdjson,simplexml,soap,sockets,sqlite3,sqlsrv,ssh2,swow,sysvshm,tokenizer,xml,xmlreader,xmlwriter,yac,yaml,zip,zlib',
22+
'Linux', 'Darwin' => 'intl',
23+
'Windows' => 'amqp,apcu',
2424
};
2525

2626
// If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).
2727
$with_libs = match (PHP_OS_FAMILY) {
28-
'Linux', 'Darwin' => 'brotli,bzip2,gmp,icu,libargon2,libavif,libcares,libevent,libiconv,liblz4,libpng,libsodium,libtiff,libwebp,libyaml,ncurses,onig,openssl,pkg-config,readline,sqlite,unixodbc,xz,zlib',
28+
'Linux', 'Darwin' => '',
2929
'Windows' => '',
3030
};
3131

0 commit comments

Comments
 (0)