diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-06-12 21:39:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 21:39:10 -0700 |
| commit | 58e0d4029e44ebfbe19f3b0fc6cc9dc88eaf1f4b (patch) | |
| tree | ec064cc5fff112d1a5a9322247a5f29a8140b4c9 | |
| parent | e1d58276662e0a4d006142776421ae48740440c3 (diff) | |
| download | vcpkg-58e0d4029e44ebfbe19f3b0fc6cc9dc88eaf1f4b.tar.gz vcpkg-58e0d4029e44ebfbe19f3b0fc6cc9dc88eaf1f4b.zip | |
[libsodium/darts-clone] remove conflicting makefile (#6875)
* [libsodium/darts-clone] remove conflicting makefile
| -rw-r--r-- | ports/darts-clone/CONTROL | 2 | ||||
| -rw-r--r-- | ports/darts-clone/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/libsodium/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libsodium/portfile.cmake | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/ports/darts-clone/CONTROL b/ports/darts-clone/CONTROL index 2d34f86c7..a0bfad433 100644 --- a/ports/darts-clone/CONTROL +++ b/ports/darts-clone/CONTROL @@ -1,3 +1,3 @@ Source: darts-clone
-Version: 1767ab87cffe
+Version: 1767ab87cffe-1
Description: A static double-array trie structure
diff --git a/ports/darts-clone/portfile.cmake b/ports/darts-clone/portfile.cmake index 2979e83b5..d7eb7941c 100644 --- a/ports/darts-clone/portfile.cmake +++ b/ports/darts-clone/portfile.cmake @@ -23,4 +23,6 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
vcpkg_copy_pdbs()
+file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am)
+
file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/darts-clone RENAME copyright)
diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL index a994a1729..cff52a1b2 100644 --- a/ports/libsodium/CONTROL +++ b/ports/libsodium/CONTROL @@ -1,3 +1,3 @@ Source: libsodium -Version: 1.0.17-2 +Version: 1.0.17-3 Description: A modern and easy-to-use crypto library diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake index b8321c6ac..c18f07992 100644 --- a/ports/libsodium/portfile.cmake +++ b/ports/libsodium/portfile.cmake @@ -40,6 +40,8 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ) +file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am) + if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") vcpkg_replace_string( ${CURRENT_PACKAGES_DIR}/include/sodium/export.h |