From 30a1dda3357bedde5e5db1db54071937823960b5 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 30 Sep 2024 21:22:09 +0530 Subject: [PATCH] zmq lib fixes --- aries_framework_vcx/Cargo.toml | 1 + aries_framework_vcx/src/scripts/ios.build.cargo.sh | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/aries_framework_vcx/Cargo.toml b/aries_framework_vcx/Cargo.toml index 837ed54b9f..e4479df1d2 100644 --- a/aries_framework_vcx/Cargo.toml +++ b/aries_framework_vcx/Cargo.toml @@ -8,6 +8,7 @@ edition = "2021" [dependencies] uniffi = { version = "0.28.0", features = ["cli"] } openssl = { version = "0.10", features = ["vendored"] } +aries_vcx_anoncreds = { path = "../aries/aries_vcx_anoncreds" } aries_vcx = { path = "../aries/aries_vcx", features = [ "askar_wallet", ] } diff --git a/aries_framework_vcx/src/scripts/ios.build.cargo.sh b/aries_framework_vcx/src/scripts/ios.build.cargo.sh index cca7c9ad6a..4cdf069dd3 100644 --- a/aries_framework_vcx/src/scripts/ios.build.cargo.sh +++ b/aries_framework_vcx/src/scripts/ios.build.cargo.sh @@ -10,7 +10,8 @@ TARGET_NICKNAME="arm64" ABI="iphoneos" - generate_bindings() { + + presetup() { brew install cmake autoconf automake libtool pkg-config git git clone https://github.com/zeromq/libzmq.git vendor/libzmq @@ -18,6 +19,11 @@ ./autogen.sh ./configure make + make install + + } + + generate_bindings() { export UNIFFI_ROOT="${ARIES_VCX_ROOT}/aries_framework_vcx" export IOS_APP_DIR="${ARIES_VCX_ROOT}/aries_framework_vcx/ios/" @@ -46,9 +52,8 @@ mkdir -p ${ABI_PATH} pushd ${UNIFFI_ROOT} - cargo build --target ${TARGET} - #--features "aries_vcx_anoncreds/zmq_vendored" - cp ${ARIES_VCX_ROOT}/aries_framework_vcx/target/${TARGET}/debug/libuniffi_vcx.a ${ABI_PATH}/libuniffi_vcx.a + cargo build --target ${TARGET} --features "aries_vcx_anoncreds/zmq_vendored" + cp ${ARIES_VCX_ROOT}/target/${TARGET}/debug/libuniffi_vcx.a ${ABI_PATH}/libuniffi_vcx.a popd } @@ -151,6 +156,7 @@ } + #presetup generate_bindings build_uniffi_for_demo build_ios_xcframework