From 3022e7e099ecad0d684f44613c234edda93425b1 Mon Sep 17 00:00:00 2001
From: "Stephan Guilloux (cos)" <stephan.guilloux@crisalid.com>
Date: Wed, 12 Oct 2022 02:42:28 +0200
Subject: [PATCH] Regression: Android build fails with libsodium.

Scenario:
```
export CURL=libsodium
cd zyre/builds/android
./ci_build.sh
```

Result:
```
Android (arm) build failed for the following reasons:
  Found no library named libzmq.so libsodium.so
    /home/stephan/git/zproject-android-testing/libzmq/builds/android/prefix/arm/lib/libzmq.so libsodium.so
```

Caused by PR #4437, where the 2nd commit was to fix Sonatype findings.

Lesson learnt: Not always a good idea to add double quotes around variables ...

Solution: Make VERIFY an array, so that Sonatype won't complain.
---
 builds/android/build.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/builds/android/build.sh b/builds/android/build.sh
index 9768f30a..b4b0806e 100755
--- a/builds/android/build.sh
+++ b/builds/android/build.sh
@@ -55,12 +55,12 @@ if [[ $ANDROID_BUILD_CLEAN ]]; then
     rm -rf "${ANDROID_BUILD_PREFIX}"/*
 fi
 
+VERIFY=("libzmq.so")
 if [ -z $CURVE ]; then
     CURVE="--disable-curve"
-    VERIFY="libzmq.so"
 elif [ $CURVE == "libsodium" ]; then
     CURVE="--with-libsodium=yes"
-    VERIFY="libzmq.so libsodium.so"
+    VERIFY+=("libsodium.so")
     ##
     # Build libsodium from latest master branch
 
@@ -84,13 +84,12 @@ elif [ $CURVE == "libsodium" ]; then
 elif [ $CURVE == "tweetnacl" ]; then
     # Default
     CURVE=""
-    VERIFY="libzmq.so"
 fi
 
 ##
 # Build libzmq from local source
 
-(android_build_verify_so ${VERIFY} &> /dev/null) || {
+(android_build_verify_so "${VERIFY[@]}" &> /dev/null) || {
     rm -rf "${cache}/libzmq"
     (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
 
-android_build_verify_so "${VERIFY}" "${ANDROID_STL}"
+android_build_verify_so "${VERIFY[@]}" "${ANDROID_STL}"
 echo "LIBZMQ (${BUILD_ARCH}) - Android build successful"