From 3aeadbd1c270f4d541bd9b57ea15daf49783e58d Mon Sep 17 00:00:00 2001
From: "Guilloux Stephan (Ubuntu)" <stephan.guilloux@crisalid.com>
Date: Fri, 18 Nov 2022 17:27:16 +0100
Subject: [PATCH] Problem: android_build_library can be more robust & generic

With these changes, this function is now able to build LIBZMQ but also
(almost) CZMQ, ZYRE (and their dependencies) in native or cross compilation
modes.
---
 builds/android/android_build_helper.sh | 50 ++++++++++++++++++--------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/builds/android/android_build_helper.sh b/builds/android/android_build_helper.sh
index 3e18cd44..c60d7424 100644
--- a/builds/android/android_build_helper.sh
+++ b/builds/android/android_build_helper.sh
@@ -472,29 +472,49 @@ function android_clone_library {
     ( cd "${root}" && git log --oneline -n 1)  || exit 1
 }
 
-# Caller must set CONFIG_OPTS before call.
+# Caller must set CONFIG_OPTS[], before call.
 function android_build_library {
     local tag=$1 ; shift
-    local clone_root=$1 ; shift
+    local root=$1 ; shift
 
     android_build_trace "Cleaning library '${tag}'."
     (
-        cd "${clone_root}" \
-        && ( make clean || : ) && \
-        rm -f config.status 
-    ) || exit 1
+        if [ -n "${ANDROID_BUILD_PREFIX}" ] && [ -d "${ANDROID_BUILD_PREFIX}" ] ; then
+            # Remove *.la files as they might cause errors with cross compiled libraries
+            find "${ANDROID_BUILD_PREFIX}" -name '*.la' -exec rm {} +
+        fi
 
+        cd "${root}" \
+        && ( make clean || : ) \
+        && rm -f config.status
+    ) &> /dev/null
+
+    android_build_trace "Building library '${tag}'."
     (
-        # Remove *.la files as they might cause errors with cross compiled libraries
-        find "${ANDROID_BUILD_PREFIX}" -name '*.la' -exec rm {} +
+        set -e
 
-        cd "${clone_root}" \
-        && ./autogen.sh \
-        && android_show_configure_opts "${tag}" "${CONFIG_OPTS[@]}" \
-        && ./configure "${CONFIG_OPTS[@]}" \
-        && make -j 4 \
-        && make install
-    ) || exit 1
+        android_show_configure_opts "${tag}" "${CONFIG_OPTS[@]}"
+
+        cd "${root}"
+        if [ -e autogen.sh ]; then
+            ./autogen.sh 2> /dev/null
+        fi
+        if [ -e buildconf ]; then
+            ./buildconf 2> /dev/null
+        fi
+        if [ ! -e autogen.sh ] && [ ! -e buildconf ] && [ ! -e ./configure ] && [ -s ./configure.ac ] ; then
+            libtoolize --copy --force && \
+            aclocal -I . && \
+            autoheader && \
+            automake --add-missing --copy && \
+            autoconf || \
+            autoreconf -fiv
+        fi
+
+        ./configure "${CONFIG_OPTS[@]}"
+        make -j 4
+        make install
+    )
 }
 
 ########################################################################