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/ccd | |
| 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/ccd')
| -rw-r--r-- | ports/ccd/0001_fix_symbols_export.patch | 39 | ||||
| -rw-r--r-- | ports/ccd/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ccd/portfile.cmake | 9 |
3 files changed, 3 insertions, 47 deletions
diff --git a/ports/ccd/0001_fix_symbols_export.patch b/ports/ccd/0001_fix_symbols_export.patch deleted file mode 100644 index f9c47d79b..000000000 --- a/ports/ccd/0001_fix_symbols_export.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 05b5718a364ac525c8766387bd74faf852f98589 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka <me@mixaill.tk> -Date: Sun, 27 Aug 2017 03:39:53 +0300 -Subject: [PATCH] win32: export additional symbols, fixes FCL build on MSVC - ---- - src/ccd/vec3.h | 2 +- - src/support.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ccd/vec3.h b/src/ccd/vec3.h -index b0c1b33..014531c 100644 ---- a/src/ccd/vec3.h -+++ b/src/ccd/vec3.h -@@ -93,7 +93,7 @@ typedef struct _ccd_vec3_t ccd_vec3_t; - /** - * Holds origin (0,0,0) - this variable is meant to be read-only! - */ --extern ccd_vec3_t *ccd_vec3_origin; -+extern _ccd_export ccd_vec3_t *ccd_vec3_origin; - - /** - * Array of points uniformly distributed on unit sphere. -diff --git a/src/support.h b/src/support.h -index 3372f5e..2e75df7 100644 ---- a/src/support.h -+++ b/src/support.h -@@ -37,7 +37,7 @@ _ccd_inline void ccdSupportCopy(ccd_support_t *, const ccd_support_t *s); - * Computes support point of obj1 and obj2 in direction dir. - * Support point is returned via supp. - */ --void __ccdSupport(const void *obj1, const void *obj2, -+_ccd_export void __ccdSupport(const void *obj1, const void *obj2, - const ccd_vec3_t *dir, const ccd_t *ccd, - ccd_support_t *supp); - --- -2.12.2.windows.2 - diff --git a/ports/ccd/CONTROL b/ports/ccd/CONTROL index 7820a1455..ded728779 100644 --- a/ports/ccd/CONTROL +++ b/ports/ccd/CONTROL @@ -1,4 +1,4 @@ Source: ccd -Version: 2.1-1 +Version: 2.1-3 Homepage: https://github.com/danfis/libccd Description: Library for collision detection between two convex shapes diff --git a/ports/ccd/portfile.cmake b/ports/ccd/portfile.cmake index 45674918e..424732917 100644 --- a/ports/ccd/portfile.cmake +++ b/ports/ccd/portfile.cmake @@ -8,11 +8,6 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/0001_fix_symbols_export.patch) - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -23,8 +18,8 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/ccd) -file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ccd RENAME copyright) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) + +file(INSTALL ${SOURCE_PATH}/BSD-LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |