diff options
| author | Ludek Vodicka <ludek.vodicka@orm-designer.com> | 2021-01-25 10:28:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 01:28:50 -0800 |
| commit | 652f267816d005fbd54161c4c8ca397ee100eff1 (patch) | |
| tree | c7b80b28dc45e687ed33ab37df916114abae3ae8 /ports | |
| parent | 496f9e4fa46ad65e79a6ffb0185996d92c076eec (diff) | |
| download | vcpkg-652f267816d005fbd54161c4c8ca397ee100eff1.tar.gz vcpkg-652f267816d005fbd54161c4c8ca397ee100eff1.zip | |
[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>
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/libxslt/CONTROL | 3 | ||||
| -rw-r--r-- | ports/libxslt/portfile.cmake | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL index 27f8c16f4..65a62940c 100644 --- a/ports/libxslt/CONTROL +++ b/ports/libxslt/CONTROL @@ -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
\ No newline at end of file diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 63cb6d322..06dd48f48 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -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() |