зеркало из https://github.com/microsoft/vcpkg.git
[libxslt] Fixed macos build (#15806)
* Fixed macos build Fixed missing libiconv library on osx build * [libxslt] Bump version * update version record * update baseline * [libxslt] Add Support field. * update version record Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
This commit is contained in:
Родитель
496f9e4fa4
Коммит
652f267816
|
@ -1,6 +1,7 @@
|
|||
Source: libxslt
|
||||
Version: 1.1.33
|
||||
Port-Version: 8
|
||||
Port-Version: 9
|
||||
Homepage: https://github.com/GNOME/libxslt
|
||||
Description: Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT
|
||||
Build-Depends: libxml2, liblzma
|
||||
Supports: !uwp
|
|
@ -83,6 +83,12 @@ else()
|
|||
find_library(LibXml2_DEBUG_LIBRARIES libxml2 PATHS ${CURRENT_INSTALLED_DIR}/debug/lib REQUIRED)
|
||||
find_library(LibXml2_RELEASE_LIBRARIES libxml2 PATHS ${CURRENT_INSTALLED_DIR}/lib REQUIRED)
|
||||
|
||||
if (VCPKG_TARGET_IS_OSX )
|
||||
set(LIBICONV "-liconv")
|
||||
else()
|
||||
set(LIBICONV "")
|
||||
endif()
|
||||
|
||||
vcpkg_configure_make(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
AUTOCONFIG
|
||||
|
@ -95,14 +101,14 @@ else()
|
|||
--with-mem-debug
|
||||
--with-debug
|
||||
--with-debugger
|
||||
--with-libxml-libs-prefix="${CURRENT_INSTALLED_DIR}/debug/lib -lxml2 -lz -llzmad"
|
||||
--with-libxml-libs-prefix="${CURRENT_INSTALLED_DIR}/debug/lib -lxml2 -lz -llzmad ${LIBICONV}"
|
||||
--with-html-dir=${CURRENT_INSTALLED_DIR}/debug/tools
|
||||
--with-html-subdir=${CURRENT_INSTALLED_DIR}/debug/tools
|
||||
OPTIONS_RELEASE
|
||||
--with-libxml-libs-prefix="${CURRENT_INSTALLED_DIR}/lib -lxml2 -lz -llzma"
|
||||
--with-libxml-libs-prefix="${CURRENT_INSTALLED_DIR}/lib -lxml2 -lz -llzma ${LIBICONV}"
|
||||
--with-html-dir=${CURRENT_INSTALLED_DIR}/tools
|
||||
--with-html-subdir=${CURRENT_INSTALLED_DIR}/tools
|
||||
)
|
||||
)
|
||||
|
||||
vcpkg_install_make()
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
|
|
@ -819,9 +819,6 @@ libwandio:arm64-windows=fail
|
|||
libwandio:arm-uwp=fail
|
||||
libxmp-lite:x64-linux=fail
|
||||
libxmp-lite:x64-osx=fail
|
||||
libxslt:arm-uwp=fail
|
||||
libxslt:x64-osx=fail
|
||||
libxslt:x64-uwp=fail
|
||||
libyuv:arm-uwp=fail
|
||||
libyuv:x64-uwp=fail
|
||||
licensepp:arm-uwp=fail
|
||||
|
|
|
@ -3482,7 +3482,7 @@
|
|||
},
|
||||
"libxslt": {
|
||||
"baseline": "1.1.33",
|
||||
"port-version": 8
|
||||
"port-version": 9
|
||||
},
|
||||
"libyaml": {
|
||||
"baseline": "0.2.5",
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "210c2ecb911a6c2445806f30a98a3f2c9a9177dc",
|
||||
"version-string": "1.1.33",
|
||||
"port-version": 9
|
||||
},
|
||||
{
|
||||
"git-tree": "a737eb337f73e61e189204c657dc32332ba0adf8",
|
||||
"version-string": "1.1.33",
|
||||
|
|
Загрузка…
Ссылка в новой задаче