summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules1
-rwxr-xr-xexternal/ios/libsodium_apple-ios.sh4
m---------external/libsodium0
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 42bd1b7..a49395d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -24,6 +24,7 @@
[submodule "external/libsodium"]
path = external/libsodium
url = https://github.com/jedisct1/libsodium.git
+ branch = stable
[submodule "external/unbound"]
path = external/unbound
url = https://github.com/NLnetLabs/unbound.git
diff --git a/external/ios/libsodium_apple-ios.sh b/external/ios/libsodium_apple-ios.sh
index 8a47a16..963ba32 100755
--- a/external/ios/libsodium_apple-ios.sh
+++ b/external/ios/libsodium_apple-ios.sh
@@ -100,7 +100,9 @@ build_ios() {
mkdir -p "${PREFIX}/tmp"
-echo "Building for iOS..."
+echo "Building for iOS... ($LOG_FILE)"
+./autogen.sh
+./configure
build_ios >"$LOG_FILE" 2>&1 || exit 1
echo "Adding the Clibsodium module map for Swift..."
diff --git a/external/libsodium b/external/libsodium
-Subproject 443617d7507498f7477703f0b51cb596d453926
+Subproject fb80cbfa59cb97c7e867074416bfde3ec337c05