Merge pull request zeromq#723 from stephan57160/master

Problem: Sync with zproject (Android build failures when <dependency>_ROOT is specified)
stephan57160 · Oct 18, 2022 · 627c5ff · 627c5ff
2 parents 2c520f2 + 326f9bb
commit 627c5ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/bindings/jni/ci_build.sh b/bindings/jni/ci_build.sh
@@ -57,6 +57,7 @@ if [ -d "${LIBZMQ_ROOT}" ] ; then
     echo "ZYRE - Cleaning LIBZMQ folder '${LIBZMQ_ROOT}' ..."
     ( cd "${LIBZMQ_ROOT}" && ( make clean || : ))
 else
+    mkdir -p "$(dirname "${LIBZMQ_ROOT}")"
     echo "ZYRE - 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
@@ -85,6 +86,7 @@ if [ -d "${CZMQ_ROOT}" ] ; then
     echo "ZYRE - Cleaning LIBCZMQ folder '${CZMQ_ROOT}' ..."
     ( cd "${CZMQ_ROOT}" && ( make clean || : ))
 else
+    mkdir -p "$(dirname "${CZMQ_ROOT}")"
     echo "ZYRE - Cloning 'https://github.com/zeromq/czmq.git' (default branch) under '${CZMQ_ROOT}' ..."
     $CI_TIME git clone --quiet --depth 1 https://github.com/zeromq/czmq.git $CZMQ_ROOT
 fi

diff --git a/builds/android/ci_build.sh b/builds/android/ci_build.sh
@@ -42,6 +42,7 @@ if [ -d "${LIBZMQ_ROOT}" ] ; then
     echo "ZYRE - Cleaning LIBZMQ folder '${LIBZMQ_ROOT}' ..."
     ( cd "${LIBZMQ_ROOT}" && ( make clean || : ))
 else
+    mkdir -p "$(dirname "${LIBZMQ_ROOT}")"
     echo "ZYRE - 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 )
@@ -51,6 +52,7 @@ if [ -d "${CZMQ_ROOT}" ] ; then
     echo "ZYRE - Cleaning LIBCZMQ folder '${CZMQ_ROOT}' ..."
     ( cd "${CZMQ_ROOT}" && ( make clean || : ))
 else
+    mkdir -p "$(dirname "${CZMQ_ROOT}")"
     echo "ZYRE - Cloning 'https://github.com/zeromq/czmq.git' (default branch) under '${CZMQ_ROOT}' ..."
     git clone --quiet --depth 1 https://github.com/zeromq/czmq.git "${CZMQ_ROOT}"
     ( cd ${CZMQ_ROOT} && git log --oneline -n 1 )