aboutsummaryrefslogtreecommitdiff
path: root/ports/libmspack
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-10-07 19:35:13 +0200
committerCurtis J Bezault <curtbezault@gmail.com>2019-10-07 10:35:13 -0700
commit726c11148105a97aef39bec024fdb7c140b1b154 (patch)
tree26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/libmspack
parente86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff)
downloadvcpkg-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/libmspack')
-rw-r--r--ports/libmspack/CONTROL2
-rw-r--r--ports/libmspack/portfile.cmake7
2 files changed, 6 insertions, 3 deletions
diff --git a/ports/libmspack/CONTROL b/ports/libmspack/CONTROL
index c81f19005..7daf9894e 100644
--- a/ports/libmspack/CONTROL
+++ b/ports/libmspack/CONTROL
@@ -1,5 +1,5 @@
Source: libmspack
-Version: 0.10.1-1
+Version: 0.10.1-2
Build-Depends:
Homepage: https://www.cabextract.org.uk/libmspack
Description: libmspack is a portable library for some loosely related Microsoft compression formats.
diff --git a/ports/libmspack/portfile.cmake b/ports/libmspack/portfile.cmake
index b476ad9a6..3da56e9cc 100644
--- a/ports/libmspack/portfile.cmake
+++ b/ports/libmspack/portfile.cmake
@@ -3,14 +3,17 @@ include(vcpkg_common_functions)
set(LIB_NAME libmspack)
set(LIB_VERSION 0.10.1alpha)
set(LIB_FILENAME ${LIB_NAME}-${LIB_VERSION}.tar.gz)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/${LIB_NAME}-${LIB_VERSION})
vcpkg_download_distfile(ARCHIVE
URLS "https://www.cabextract.org.uk/libmspack/${LIB_FILENAME}"
FILENAME "${LIB_FILENAME}"
SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
)
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+ ARCHIVE ${ARCHIVE}
+ OUT_SOURCE_PATH SOURCE_PATH
+)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH})