summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorKonstantin Ullrich <konstantinullrich12@gmail.com>2024-10-07 12:37:30 +0200
committerKonstantin Ullrich <konstantinullrich12@gmail.com>2024-10-07 12:37:30 +0200
commit98272ee381bd07081502dd426226f58c879300a6 (patch)
tree672f6f06727dbc1c84270973ce13e9403913e481 /external
parent04b29d84a2c368c677cf5ec946269203622ca170 (diff)
parent67f4baa015a4407d096e35b6e5a81d72932fb55f (diff)
Merge branch 'master' into ledger
# Conflicts: # .github/workflows/full_check.yaml # impls/monero.dart/lib/monero.dart # impls/monero.dart/pubspec.yaml # patches/monero/0016-add-dummy-device-for-ledger.patch
Diffstat (limited to 'external')
m---------external/OpenSSL-for-iPhone0
m---------external/ios-cmake0
-rwxr-xr-xexternal/ios/libsodium_apple-ios.sh4
m---------external/libexpat0
m---------external/libsodium0
m---------external/libzmq0
6 files changed, 3 insertions, 1 deletions
diff --git a/external/OpenSSL-for-iPhone b/external/OpenSSL-for-iPhone
-Subproject 394bac11f4347cc21b4ba976c1c0629afaf67c5
+Subproject d3ec433a47708594d18ef6e248b66e3d64f00f0
diff --git a/external/ios-cmake b/external/ios-cmake
-Subproject 06465b27698424cf4a04a5ca4904d50a3c966c4
+Subproject ad96a372b168930c2a1ff9455e1a9ccb1302161
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/libexpat b/external/libexpat
-Subproject 3bab6c09bbe8bf42d84b81563ddbcf4cca4be83
+Subproject 46cf63aef169f8f12ea09579db883c5251bd47d
diff --git a/external/libsodium b/external/libsodium
-Subproject 443617d7507498f7477703f0b51cb596d453926
+Subproject fb80cbfa59cb97c7e867074416bfde3ec337c05
diff --git a/external/libzmq b/external/libzmq
-Subproject b95d94935ed107679fd0ad9efd2f3d47309b6fd
+Subproject 90b4f410a07222fa2e9a5f53b454a09d4533e45