aboutsummaryrefslogtreecommitdiff
path: root/ports/libsodium
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2019-06-12 21:39:10 -0700
committerGitHub <noreply@github.com>2019-06-12 21:39:10 -0700
commit58e0d4029e44ebfbe19f3b0fc6cc9dc88eaf1f4b (patch)
treeec064cc5fff112d1a5a9322247a5f29a8140b4c9 /ports/libsodium
parente1d58276662e0a4d006142776421ae48740440c3 (diff)
downloadvcpkg-58e0d4029e44ebfbe19f3b0fc6cc9dc88eaf1f4b.tar.gz
vcpkg-58e0d4029e44ebfbe19f3b0fc6cc9dc88eaf1f4b.zip
[libsodium/darts-clone] remove conflicting makefile (#6875)
* [libsodium/darts-clone] remove conflicting makefile
Diffstat (limited to 'ports/libsodium')
-rw-r--r--ports/libsodium/CONTROL2
-rw-r--r--ports/libsodium/portfile.cmake2
2 files changed, 3 insertions, 1 deletions
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