aboutsummaryrefslogtreecommitdiff
path: root/ports/ode
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/ode
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/ode')
-rw-r--r--ports/ode/CONTROL2
-rw-r--r--ports/ode/portfile.cmake12
2 files changed, 8 insertions, 6 deletions
diff --git a/ports/ode/CONTROL b/ports/ode/CONTROL
index 4d0a0b724..3754de88b 100644
--- a/ports/ode/CONTROL
+++ b/ports/ode/CONTROL
@@ -1,4 +1,4 @@
Source: ode
-Version: 0.15.1-2
+Version: 0.15.1-3
Homepage: https://bitbucket.org/odedevs/ode/src/default/
Description: Open Dynamics Engine
diff --git a/ports/ode/portfile.cmake b/ports/ode/portfile.cmake
index 13a31e335..729740c45 100644
--- a/ports/ode/portfile.cmake
+++ b/ports/ode/portfile.cmake
@@ -1,16 +1,18 @@
include(vcpkg_common_functions)
+
set(SOURCE_VERSION 0.15.1)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ode-${SOURCE_VERSION})
+
vcpkg_download_distfile(ARCHIVE
URLS "https://bitbucket.org/odedevs/ode/downloads/ode-${SOURCE_VERSION}.tar.gz"
FILENAME "ode-${SOURCE_VERSION}.tar.gz"
SHA512 e30623374c8f7c45359d6d837313698ca28da7b5a2d26c7171da16ccd6f95c4a49aad731c432db6ca2911886948a2e7ea93a96ade5a1639b945a825d8ac87249
)
-vcpkg_extract_source_archive(${ARCHIVE})
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-add-static-runtime-option.patch"
+vcpkg_extract_source_archive_ex(
+ OUT_SOURCE_PATH SOURCE_PATH
+ ARCHIVE ${ARCHIVE}
+ PATCHES
+ 0001-add-static-runtime-option.patch
)
if (TRIPLET_SYSTEM_ARCH MATCHES "arm")