diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/libdatrie | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/libdatrie')
| -rw-r--r-- | ports/libdatrie/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libdatrie/portfile.cmake | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ports/libdatrie/CONTROL b/ports/libdatrie/CONTROL index 587063ec5..ddcdf9972 100644 --- a/ports/libdatrie/CONTROL +++ b/ports/libdatrie/CONTROL @@ -1,5 +1,5 @@ Source: libdatrie -Version: 0.2.10-2 +Version: 0.2.10-3 Homepage: https://linux.thai.net/pub/ThaiLinux/software/libthai Description: implementation of double-array structure for representing trie Build-Depends: libiconv diff --git a/ports/libdatrie/portfile.cmake b/ports/libdatrie/portfile.cmake index f7fefd248..74b8bbd80 100644 --- a/ports/libdatrie/portfile.cmake +++ b/ports/libdatrie/portfile.cmake @@ -2,17 +2,16 @@ set(LIBDATRIE_VERSION 0.2.10) include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libdatrie-${LIBDATRIE_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://linux.thai.net/pub/ThaiLinux/software/libthai/libdatrie-${LIBDATRIE_VERSION}.tar.xz" FILENAME "libdatrie-${LIBDATRIE_VERSION}.tar.xz" SHA512 ee68ded9d6e06c562da462d42e7e56098a82478d7b8547506200c3018b72536c4037a4e518924f779dc77d3ab139d93216bdb29ab4116b9dc9efd1a5d1eb9e31 ) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES +vcpkg_extract_source_archive_ex( + ARCHIVE ${ARCHIVE} + OUT_SOURCE_PATH SOURCE_PATH + PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-exports.patch" "${CMAKE_CURRENT_LIST_DIR}/fix-trietool.patch" ) |