generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-07-01 08:23:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4435 from stephan57160/master

Browse Source 
Problem: Android build system needs some debug (./configure options)
This commit is contained in:
Luca Boccassi 2022-10-06 18:34:04 +02:00 committed by GitHub
commit 1c92300933
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builds/android/android_build_helper.sh
View File

@ -333,3 +333,14 @@ function android_build_verify_so {
android_build_check_fail android_build_check_fail
} }
function android_show_configure_opts {
local tag=$1
shift
echo "LIBZMQ (${BUILD_ARCH}) - ./configure options to build '${tag}':"
for opt in "$@"; do
echo " > ${opt}"
done
echo ""
}

31
builds/android/build.sh
View File

@ -70,10 +70,19 @@ elif [ $CURVE == "libsodium" ]; then
(android_build_verify_so "libsodium.so" &> /dev/null) || { (android_build_verify_so "libsodium.so" &> /dev/null) || {
rm -rf "${cache}/libsodium" rm -rf "${cache}/libsodium"
(cd "${cache}" && git clone -b stable --depth 1 https://github.com/jedisct1/libsodium.git) || exit 1 (cd "${cache}" && git clone -b stable --depth 1 https://github.com/jedisct1/libsodium.git) || exit 1
(cd "${cache}/libsodium" && ./autogen.sh \ (
&& ./configure --quiet "${ANDROID_BUILD_OPTS[@]}" --disable-soname-versions \ CONFIG_OPTS=()
CONFIG_OPTS+=("--quiet")
CONFIG_OPTS+=("${ANDROID_BUILD_OPTS[@]}")
CONFIG_OPTS+=("--disable-soname-versions")
cd "${cache}/libsodium" \
&& ./autogen.sh \
&& android_show_configure_opts "LIBSODIUM" "${CONFIG_OPTS[@]}" \
&& ./configure "${CONFIG_OPTS[@]}" \
&& make -j 4 \ && make -j 4 \
&& make install) || exit 1 && make install
) || exit 1
} }
elif [ $CURVE == "tweetnacl" ]; then elif [ $CURVE == "tweetnacl" ]; then
# Default # Default
@ -90,10 +99,20 @@ LIBTOOL_EXTRA_LDFLAGS='-avoid-version'
rm -rf "${cache}/libzmq" rm -rf "${cache}/libzmq"
(cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && ( make clean || : )) (cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && ( make clean || : ))
(cd "${cache}/libzmq" && ./autogen.sh \ (
&& ./configure --quiet "${ANDROID_BUILD_OPTS[@]}" ${CURVE} --without-docs \ CONFIG_OPTS=()
CONFIG_OPTS+=("--quiet")
CONFIG_OPTS+=("${ANDROID_BUILD_OPTS[@]}")
CONFIG_OPTS+=("${CURVE}")
CONFIG_OPTS+=("--without-docs")
cd "${cache}/libzmq" \
&& ./autogen.sh \
&& android_show_configure_opts "LIBZMQ" "${CONFIG_OPTS[@]}" \
&& ./configure "${CONFIG_OPTS[@]}" \
&& make -j 4 \ && make -j 4 \
&& make install) || exit 1 && make install
) || exit 1
} }
## ##