aboutsummaryrefslogtreecommitdiff
path: root/ports/libsodium
diff options
context:
space:
mode:
authorNicole Mazzuca <t-nimaz@microsoft.com>2019-07-19 12:17:22 -0700
committerNicole Mazzuca <t-nimaz@microsoft.com>2019-07-19 12:17:22 -0700
commitb3caf67749f21952e0157ba77ece755aa01b254a (patch)
treedff6a178b506fdc58e28bbc9094f1687eb99bd72 /ports/libsodium
parentfddebb75da034752fb267ba121497ba58157bb79 (diff)
parent618fa203c13c30bd19826988cff66481bca0562f (diff)
downloadvcpkg-b3caf67749f21952e0157ba77ece755aa01b254a.tar.gz
vcpkg-b3caf67749f21952e0157ba77ece755aa01b254a.zip
Merge branch 'trunk' into parallel-file-ops
Diffstat (limited to 'ports/libsodium')
-rw-r--r--ports/libsodium/CMakeLists.txt10
-rw-r--r--ports/libsodium/CONTROL2
2 files changed, 6 insertions, 6 deletions
diff --git a/ports/libsodium/CMakeLists.txt b/ports/libsodium/CMakeLists.txt
index 62e4d1875..0cc4f417c 100644
--- a/ports/libsodium/CMakeLists.txt
+++ b/ports/libsodium/CMakeLists.txt
@@ -152,24 +152,24 @@ else ()
-Wbad-function-cast
-Wcast-qual
#-Wdiv-by-zero
- -Wduplicated-branches
- -Wduplicated-cond
+ #-Wduplicated-branches
+ #-Wduplicated-cond
-Wfloat-equal
-Wformat=2
-Wlogical-op
-Wmaybe-uninitialized
- -Wmisleading-indentation
+ #-Wmisleading-indentation
-Wmissing-declarations
-Wmissing-prototypes
-Wnested-externs
#-Wno-type-limits
#-Wno-unknown-pragmas
-Wnormalized=id
- -Wnull-dereference
+ #-Wnull-dereference
-Wold-style-declaration
-Wpointer-arith
-Wredundant-decls
- -Wrestrict
+ #-Wrestrict
#-Wsometimes-uninitialized
-Wstrict-prototypes
-Wswitch-enum
diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL
index 333f08031..daf768c1b 100644
--- a/ports/libsodium/CONTROL
+++ b/ports/libsodium/CONTROL
@@ -1,4 +1,4 @@
Source: libsodium
-Version: 1.0.18
+Version: 1.0.18-1
Description: A modern and easy-to-use crypto library
Homepage: https://github.com/jedisct1/libsodium