From c2f50ba11ddec0d8e5a7fd68902d1b7b27267128 Mon Sep 17 00:00:00 2001 From: Naomi Plasterer Date: Sat, 20 Jul 2024 13:38:19 -0600 Subject: [PATCH] more updates to the makefile --- .github/workflows/release-swift-bindings.yml | 4 ++++ bindings_ffi/Makefile | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-swift-bindings.yml b/.github/workflows/release-swift-bindings.yml index 9e364d32f..c6d5024be 100644 --- a/.github/workflows/release-swift-bindings.yml +++ b/.github/workflows/release-swift-bindings.yml @@ -37,6 +37,10 @@ jobs: run: | cargo install cross --git https://github.com/cross-rs/cross + - name: Install OpenSSL + run: | + brew install openssl + - name: Download and build SQLCipher working-directory: bindings_ffi run: | diff --git a/bindings_ffi/Makefile b/bindings_ffi/Makefile index 16c354562..56dd88bb6 100644 --- a/bindings_ffi/Makefile +++ b/bindings_ffi/Makefile @@ -31,9 +31,12 @@ download-toolchains: download-sqlcipher: git clone https://github.com/sqlcipher/sqlcipher.git $(SQLCIPHER_DIR) -build-sqlcipher: +install-openssl: + brew install openssl + +build-sqlcipher: install-openssl cd $(SQLCIPHER_DIR) && \ - ./configure --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" && \ + ./configure --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC" LDFLAGS="-L/usr/local/opt/openssl/lib" CPPFLAGS="-I/usr/local/opt/openssl/include" && \ make all: framework @@ -93,4 +96,4 @@ swift: libxmtp-version swiftlocal: libxmtpv3.a swift framework -.PHONY: $(ARCHS_IOS) $(ARCHS_MAC) framework all aarch64-apple-ios install-jar echo-jar download-toolchains swift lipo download-sqlcipher build-sqlcipher +.PHONY: $(ARCHS_IOS) $(ARCHS_MAC) framework all aarch64-apple-ios install-jar echo-jar download-toolchains swift lipo download-sqlcipher install-openssl build-sqlcipher