PEMA-158 Switch to openpgp/v1.3.1 (old ffi)

PEMA-158
Dirk Zimmermann 4 weeks ago
parent 5c0034b884
commit eb08e98d1a

@ -9,7 +9,7 @@
<key>GMP_VERSION</key>
<string>6.2.1</string>
<key>SEQUOIA_VERSION</key>
<string>main</string>
<string>openpgp/v1.3.1</string>
<key>PEP_ENGINE_VERSION</key>
<string>master</string>
<key>LIB_PEP_ADAPTER_VERSION</key>

@ -5,9 +5,9 @@ fi
VERSION=$(sh "${SCRIPT_DIR}/get-pEp-version.sh" "SEQUOIA_VERSION")
SEQUOIA_DIR="${TMP_DIR}/pEpEngineSequoiaBackend"
SEQUOIA_DIR="${TMP_DIR}/sequoia"
if [ ! -d "${SEQUOIA_DIR}" ]; then
git clone -b ${VERSION} --depth 1 https://gitea.pep.foundation/dirk/pEpEngineSequoiaBackend.git
git clone -b ${VERSION} --depth 1 https://gitlab.com/sequoia-pgp/sequoia.git
fi
# NOTE: Needed only for iOS, macOS can generate these automatically.
@ -18,7 +18,7 @@ PKG_CONFIG_PATH=$OUTPUT_DIR/${ARCH}/lib/pkgconfig
build_ios()
{
NETTLE_PREGENERATED_BINDINGS="${NETTLE_BINDINGS}" PKG_CONFIG_ALLOW_CROSS=1 RUST_BACKTRACE=1 PKG_CONFIG_PATH=$PKG_CONFIG_PATH RUSTFLAGS="-L ${PREFIX}/lib" cargo build --target ${TARGET} --release
NETTLE_PREGENERATED_BINDINGS="${NETTLE_BINDINGS}" PKG_CONFIG_ALLOW_CROSS=1 RUST_BACKTRACE=1 PKG_CONFIG_PATH=$PKG_CONFIG_PATH RUSTFLAGS="-L ${PREFIX}/lib" cargo build --package sequoia-openpgp-ffi --target ${TARGET} --release
# copy artefacts
cp "${SEQUOIA_DIR}/target/${TARGET}/release"/*.a "${CURRENT_LIB_DIR}/lib"
}
@ -27,7 +27,7 @@ build_macos()
{
SDKROOT=$(xcrun -sdk ${SDK} --show-sdk-path) \
# JSONAdapter needlessly requires libsequoia_ffi.a
PKG_CONFIG_ALLOW_CROSS=1 RUST_BACKTRACE=full PKG_CONFIG_PATH=${CURRENT_LIB_DIR}/lib/pkgconfig RUSTFLAGS="-L ${PREFIX}/lib" cargo build --target ${HOST} --release
PKG_CONFIG_ALLOW_CROSS=1 RUST_BACKTRACE=full PKG_CONFIG_PATH=${CURRENT_LIB_DIR}/lib/pkgconfig RUSTFLAGS="-L ${PREFIX}/lib" cargo build --package sequoia-openpgp-ffi --target ${HOST} --release
cp "${SEQUOIA_DIR}/target/${HOST}/release"/*.a "${CURRENT_LIB_DIR}/lib"
}

Loading…
Cancel
Save