Merge pull request zeromq#722 from stephan57160/master

Problem: Sync with zproject (Android build system needs some debug (./configure options)).
stephan57160 · Oct 13, 2022 · 2c520f2 · 2c520f2
2 parents dec2686 + 9a9139c
commit 2c520f2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/builds/android/android_build_helper.sh b/builds/android/android_build_helper.sh
@@ -310,6 +310,16 @@ function android_build_verify_so {
     android_build_check_fail
 }
 
+function android_show_configure_opts {
+    local tag=$1
+    shift
+    echo "ZYRE (${BUILD_ARCH}) - ./configure options to build '${tag}':"
+    for opt in "$@"; do
+        echo "  > ${opt}"
+    done
+    echo ""
+}
+
 ################################################################################
 #  THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY  #
 #  Read the zproject/README.md for information about making permanent changes. #

diff --git a/builds/android/build.sh b/builds/android/build.sh
@@ -113,8 +113,16 @@ fi
 
     export LIBTOOL_EXTRA_LDFLAGS='-avoid-version'
 
-    (cd "${cache}/zyre" && $CI_TIME ./autogen.sh 2> /dev/null \
-        && $CI_TIME ./configure --quiet "${ANDROID_BUILD_OPTS[@]}" --without-docs \
+    (
+        CONFIG_OPTS=()
+        CONFIG_OPTS+=("--quiet")
+        CONFIG_OPTS+=("${ANDROID_BUILD_OPTS[@]}")
+        CONFIG_OPTS+=("--without-docs")
+
+        cd "${cache}/zyre" \
+        && $CI_TIME ./autogen.sh 2> /dev/null \
+        && android_show_configure_opts "LIBZYRE" "${CONFIG_OPTS[@]}" \
+        && $CI_TIME ./configure "${CONFIG_OPTS[@]}" \
         && $CI_TIME make -j 4 \
         && $CI_TIME make install) || exit 1
 }