mirror of
https://github.com/zeromq/libzmq.git
synced 2025-02-02 07:16:48 +01:00
Merge pull request #1387 from c-rack/1386-libsodium-checkout
Solution: Build libsodium from latest master branch. Fixes 1386.
This commit is contained in:
commit
e1e9fb3629
@ -26,15 +26,11 @@ if [[ $ANDROID_BUILD_CLEAN ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
##
|
##
|
||||||
# Build libsodium from latest release tarball
|
# Build libsodium from latest master branch
|
||||||
|
|
||||||
(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}" && mkdir libsodium \
|
(cd "${cache}" && git clone git://github.com/jedisct1/libsodium.git) || exit 1
|
||||||
&& wget https://download.libsodium.org/libsodium/releases/LATEST.tar.gz\
|
|
||||||
-O "${cache}/libsodium.tar.gz" \
|
|
||||||
&& tar -C libsodium -xf libsodium.tar.gz --strip=1) || exit 1
|
|
||||||
|
|
||||||
(cd "${cache}/libsodium" && ./autogen.sh \
|
(cd "${cache}/libsodium" && ./autogen.sh \
|
||||||
&& ./configure "${ANDROID_BUILD_OPTS[@]}" --disable-soname-versions \
|
&& ./configure "${ANDROID_BUILD_OPTS[@]}" --disable-soname-versions \
|
||||||
&& make \
|
&& make \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user