mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-12 18:40:27 +01:00
Problem: Android build system needs some debug (./configure options)
Proposal is to dump ./configure options to have an output like below: ``` LIBZMQ (x86_64) - ./configure options to build 'LIBZMQ': > --quiet > TOOLCHAIN=/tmp/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64 > CC=/tmp/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang > CXX=/tmp/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang++ > LD=/tmp/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/bin/ld > AS=/tmp/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as > AR=/tmp/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar > RANLIB=/tmp/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib > STRIP=/tmp/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip > CFLAGS= -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE > CPPFLAGS= -I/builds/CrisalidBox/zproject-android-testing/libzmq/builds/android/prefix/x86_64/include > CXXFLAGS= > LDFLAGS=-L/builds/CrisalidBox/zproject-android-testing/libzmq/builds/android/prefix/x86_64/lib -L/tmp/android-ndk-r25/sources/cxx-stl/llvm-libc++/libs/x86_64 > LIBS=-lc -ldl -lm -llog -lc++_shared > PKG_CONFIG_LIBDIR=/tmp/android-ndk-r25/prebuilt/linux-x86_64/lib/pkgconfig > PKG_CONFIG_PATH=/builds/CrisalidBox/zproject-android-testing/libzmq/builds/android/prefix/x86_64/lib/pkgconfig > PKG_CONFIG_SYSROOT_DIR=/tmp/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/sysroot > PKG_CONFIG_DIR= > --with-sysroot=/tmp/android-ndk-r25/toolchains/llvm/prebuilt/linux-x86_64/sysroot > --host=x86_64-linux-android > --prefix=/builds/CrisalidBox/zproject-android-testing/libzmq/builds/android/prefix/x86_64 > --disable-curve > --without-docs ``` Note: This mechanism is currently in use to identify/fix a bug in a recent PR for NDK update. This mechanism is added before every call of `./configure`. To be reported to CZMQ/ZYRE (via ZPROJECT).
This commit is contained in:
parent
875c2b15c3
commit
a20527da7f
@ -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 ""
|
||||||
|
}
|
||||||
|
|
||||||
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
##
|
##
|
||||||
|
Loading…
Reference in New Issue
Block a user