crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-03-18 04:44:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix libxml2 with icu finding issue (#304)

Browse Source 
* fix libxml2 with icu finding issue

* add test
This commit is contained in:
Jerry Ma 2024-01-03 13:40:48 +08:00 committed by GitHub
parent fa0ea5443d
commit eac4763d82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/lib.json
View File

@ -333,10 +333,6 @@
"lib-suggests": [
"xz",
"icu"
],
"lib-suggests-windows": [
"icu",
"xz"
]
},
"libxslt": {

6
src/SPC/builder/linux/library/libxml2.php
View File

@ -26,7 +26,9 @@ class libxml2 extends LinuxLibraryBase
shell()->cd($this->source_dir . '/build')
->exec(
'cmake ' .
"{$this->builder->makeCmakeArgs()} " .
'-DCMAKE_BUILD_TYPE=Release ' .
'-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
"-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
'-DBUILD_SHARED_LIBS=OFF ' .
'-DIconv_IS_BUILT_IN=OFF ' .
'-DLIBXML2_WITH_ICONV=ON ' .
@ -39,7 +41,7 @@ class libxml2 extends LinuxLibraryBase
'..'
)
->exec("cmake --build . -j {$this->builder->concurrency}")
->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
->exec('make install');
FileSystem::replaceFileStr(
BUILD_LIB_PATH . '/pkgconfig/libxml-2.0.pc',

6
src/SPC/builder/macos/library/libxml2.php
View File

@ -27,7 +27,9 @@ class libxml2 extends MacOSLibraryBase
->exec(
'cmake ' .
// '--debug-find ' .
"{$this->builder->makeCmakeArgs()} " .
'-DCMAKE_BUILD_TYPE=Release ' .
'-DCMAKE_INSTALL_PREFIX=' . BUILD_ROOT_PATH . ' ' .
"-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
'-DBUILD_SHARED_LIBS=OFF ' .
'-DLIBXML2_WITH_ICONV=ON ' .
"-DLIBXML2_WITH_ZLIB={$enable_zlib} " .
@ -39,6 +41,6 @@ class libxml2 extends MacOSLibraryBase
'..'
)
->exec("cmake --build . -j {$this->builder->concurrency}")
->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
->exec('make install');
}
}

2
src/globals/test-extensions.php
View File

@ -10,7 +10,7 @@ declare(strict_types=1);
// --------------------------------- edit area ---------------------------------
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
$extensions = 'swoole,swoole-hook-pgsql,swoole-hook-mysql,swoole-hook-sqlite';
$extensions = 'xml,intl';
// If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).
$with_libs = '';