more updates to the makefile

xmtp · Jul 20, 2024 · c2f50ba · c2f50ba
1 parent 849085b
commit c2f50ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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