From 0c09fa69e1fc1dda8172c63c643b77953b33a145 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 13 Apr 2023 21:35:47 +0100 Subject: [PATCH] Fix missing symbols in static sqlcipher aarch64 build --- .github/workflows/build_and_test.yaml | 5 ----- .github/workflows/build_linux.yaml | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml index 7bb5f320..e9bbc04e 100644 --- a/.github/workflows/build_and_test.yaml +++ b/.github/workflows/build_and_test.yaml @@ -79,11 +79,6 @@ jobs: matrix: sqlcipher: [system, static] arch: [amd64, arm64] - exclude: - # FIXME: This combination yields a broken Seshat at this time - # Errors at launch with `undefined symbol: PKCS5_PBKDF2_HMAC - - arch: arm64 - sqlcipher: static with: config: ${{ github.event.pull_request.base.ref == 'develop' && 'element.io/nightly' || 'element.io/release' }} sqlcipher: ${{ matrix.sqlcipher }} diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index 866e2cfb..6b424176 100644 --- a/.github/workflows/build_linux.yaml +++ b/.github/workflows/build_linux.yaml @@ -84,6 +84,7 @@ jobs: if: inputs.sqlcipher == 'static' run: | echo "SQLCIPHER_STATIC=1" >> $GITHUB_ENV + echo "LDFLAGS=-lcrypto" >> $GITHUB_ENV # Ideally the docker image would be ready for cross-compilation but libsqlcipher-dev is not Multi-Arch compatible # https://unix.stackexchange.com/a/349359