Merge pull request zeromq#2243 from stephan57160/master

Problem: Sync with zproject (Android build failures when <dependency>_ROOT is specified)
stephan57160 · Oct 18, 2022 · 1a28bb9 · 1a28bb9
2 parents 7339450 + a4d3dab
commit 1a28bb9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/bindings/jni/ci_build.sh b/bindings/jni/ci_build.sh
@@ -62,6 +62,7 @@ else
     rm -f $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz")
     wget http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz
     tar -xzf $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz")
+    mkdir -p "$(dirname "${LIBMICROHTTPD_ROOT}")"
     mv $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz" .tar.gz) $LIBMICROHTTPD_ROOT
     echo "CZMQ - LIBMICROHTTPD extracted under under '${LIBMICROHTTPD_ROOT}'."
 fi
@@ -74,6 +75,7 @@ if [ -d "${LIBZMQ_ROOT}" ] ; then
     echo "CZMQ - Cleaning LIBZMQ folder '${LIBZMQ_ROOT}' ..."
     ( cd "${LIBZMQ_ROOT}" && ( make clean || : ))
 else
+    mkdir -p "$(dirname "${LIBZMQ_ROOT}")"
     echo "CZMQ - Cloning 'https://github.com/zeromq/libzmq.git' (default branch) under '${LIBZMQ_ROOT}' ..."
     $CI_TIME git clone --quiet --depth 1 https://github.com/zeromq/libzmq.git $LIBZMQ_ROOT
 fi
@@ -102,6 +104,7 @@ if [ -d "${LIBCURL_ROOT}" ] ; then
     echo "CZMQ - Cleaning LIBCURL folder '${LIBCURL_ROOT}' ..."
     ( cd "${LIBCURL_ROOT}" && ( make clean || : ))
 else
+    mkdir -p "$(dirname "${LIBCURL_ROOT}")"
     echo "CZMQ - Cloning 'https://github.com/curl/curl.git' (default branch) under '${LIBCURL_ROOT}' ..."
     $CI_TIME git clone --quiet --depth 1 https://github.com/curl/curl.git $LIBCURL_ROOT
 fi

diff --git a/builds/android/build.sh b/builds/android/build.sh
@@ -124,7 +124,8 @@ fi
         && android_show_configure_opts "LIBCZMQ" "${CONFIG_OPTS[@]}" \
         && $CI_TIME ./configure "${CONFIG_OPTS[@]}" \
         && $CI_TIME make -j 4 \
-        && $CI_TIME make install) || exit 1
+        && $CI_TIME make install
+    ) || exit 1
 }
 
 ##

diff --git a/builds/android/ci_build.sh b/builds/android/ci_build.sh
@@ -39,14 +39,15 @@ fi
 rm -rf /tmp/tmp-deps
 mkdir -p /tmp/tmp-deps
 
-if [ -d "${LIBMICROHTTPD_root}" ] ; then
+if [ -d "${LIBMICROHTTPD_ROOT}" ] ; then
     echo "CZMQ - Cleaning LIBMICROHTTPD folder '${LIBMICROHTTPD_ROOT}' ..."
     ( cd "${LIBMICROHTTPD_ROOT}" && ( make clean || : ))
 else
     echo "CZMQ - Downloading LIBMICROHTTPD from 'http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz' ..."
     rm -f $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz")
     wget http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz
     tar -xzf $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz")
+    mkdir -p "$(dirname "${LIBMICROHTTPD_ROOT}")"
     mv $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz" .tar.gz) $LIBMICROHTTPD_ROOT
     echo "CZMQ - LIBMICROHTTPD extracted under under '${LIBMICROHTTPD_ROOT}' ..."
 fi
@@ -55,6 +56,7 @@ if [ -d "${LIBZMQ_ROOT}" ] ; then
     echo "CZMQ - Cleaning LIBZMQ folder '${LIBZMQ_ROOT}' ..."
     ( cd "${LIBZMQ_ROOT}" && ( make clean || : ))
 else
+    mkdir -p "$(dirname "${LIBZMQ_ROOT}")"
     echo "CZMQ - Cloning 'https://github.com/zeromq/libzmq.git' (default branch) under '${LIBZMQ_ROOT}' ..."
     git clone --quiet --depth 1 https://github.com/zeromq/libzmq.git "${LIBZMQ_ROOT}"
     ( cd ${LIBZMQ_ROOT} && git log --oneline -n 1 )
@@ -64,6 +66,7 @@ if [ -d "${LIBCURL_ROOT}" ] ; then
     echo "CZMQ - Cleaning LIBCURL folder '${LIBCURL_ROOT}' ..."
     ( cd "${LIBCURL_ROOT}" && ( make clean || : ))
 else
+    mkdir -p "$(dirname "${LIBCURL_ROOT}")"
     echo "CZMQ - Cloning 'https://github.com/curl/curl.git' (default branch) under '${LIBCURL_ROOT}' ..."
     git clone --quiet --depth 1 https://github.com/curl/curl.git "${LIBCURL_ROOT}"
     ( cd ${LIBCURL_ROOT} && git log --oneline -n 1 )