3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-27 15:41:05 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4439 from stephan57160/master

Browse Source 
Regression: Android build fails with libsodium.
This commit is contained in:
Luca Boccassi 2022-10-12 10:27:37 +02:00 committed by GitHub
commit a3f95107db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builds/android/build.sh
View File

@ -55,12 +55,12 @@ if [[ $ANDROID_BUILD_CLEAN ]]; then
rm -rf "${ANDROID_BUILD_PREFIX}"/* rm -rf "${ANDROID_BUILD_PREFIX}"/*
fi fi
VERIFY=("libzmq.so")
if [ -z $CURVE ]; then if [ -z $CURVE ]; then
CURVE="--disable-curve" CURVE="--disable-curve"
VERIFY="libzmq.so"
elif [ $CURVE == "libsodium" ]; then elif [ $CURVE == "libsodium" ]; then
CURVE="--with-libsodium=yes" CURVE="--with-libsodium=yes"
VERIFY="libzmq.so libsodium.so" VERIFY+=("libsodium.so")
## ##
# Build libsodium from latest master branch # Build libsodium from latest master branch
@ -84,13 +84,12 @@ elif [ $CURVE == "libsodium" ]; then
elif [ $CURVE == "tweetnacl" ]; then elif [ $CURVE == "tweetnacl" ]; then
# Default # Default
CURVE="" CURVE=""
VERIFY="libzmq.so"
fi fi
## ##
# Build libzmq from local source # Build libzmq from local source
(android_build_verify_so ${VERIFY} &> /dev/null) || { (android_build_verify_so "${VERIFY[@]}" &> /dev/null) || {
rm -rf "${cache}/libzmq" rm -rf "${cache}/libzmq"
(cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && ( make clean || : )) (cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && ( make clean || : ))
@ -118,5 +117,5 @@ cp "${ANDROID_STL_ROOT}/${ANDROID_STL}" "${ANDROID_BUILD_PREFIX}/lib/."
## ##
# Verify shared libraries in prefix # Verify shared libraries in prefix
android_build_verify_so "${VERIFY}" "${ANDROID_STL}" android_build_verify_so "${VERIFY[@]}" "${ANDROID_STL}"
echo "LIBZMQ (${BUILD_ARCH}) - Android build successful" echo "LIBZMQ (${BUILD_ARCH}) - Android build successful"