Compare commits

...

2 Commits

Author SHA1 Message Date
crazywhalecc
dabdb518ce
xz use github 2024-01-03 14:56:39 +08:00
Jerry Ma
eac4763d82
fix libxml2 with icu finding issue (#304)
* fix libxml2 with icu finding issue

* add test
2024-01-03 13:40:48 +08:00
5 changed files with 12 additions and 12 deletions

View File

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

View File

@ -562,9 +562,9 @@
}
},
"xz": {
"type": "filelist",
"url": "https://tukaani.org/xz/",
"regex": "/href=\"(?<file>xz-(?<version>[^\"]+)\\.tar\\.xz)\"/",
"type": "ghrel",
"repo": "tukaani-project/xz",
"match": "xz-.+\\.tar\\.gz",
"license": {
"type": "file",
"path": "COPYING"

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',

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');
}
}

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 = '';