From 326f9bbdba2497548edf22b068b7a61d8745e85f Mon Sep 17 00:00:00 2001
From: "Stephan Guilloux (cos)" <stephan.guilloux@crisalid.com>
Date: Tue, 18 Oct 2022 21:05:59 +0200
Subject: [PATCH] Problem: Sync with zproject (Android build failures when
 <dependency>_ROOT is specified)

Solution: Regenerate ZYRE with this commit.
---
 bindings/jni/ci_build.sh   | 2 ++
 builds/android/ci_build.sh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/bindings/jni/ci_build.sh b/bindings/jni/ci_build.sh
index 89ac8663..17b1b5b7 100755
--- 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
index c64acfb9..82870373 100755
--- 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 )