Skip to content

Commit

Permalink
Merge pull request zeromq#4427 from stephan57160/master
Browse files Browse the repository at this point in the history
Problem: builds/android/build.sh fails with CURVE=libsodium
  • Loading branch information
bluca committed Sep 22, 2022
2 parents 9d4685d + d4dd8a5 commit ec6f3b1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion builds/android/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ elif [ $CURVE == "libsodium" ]; then

(android_build_verify_so "libsodium.so" &> /dev/null) || {
rm -rf "${cache}/libsodium"
(cd "${cache}" && git clone -b stable --depth 1 git://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 \
&& make -j 4 \
Expand Down
2 changes: 1 addition & 1 deletion builds/cmake/ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ elif [ $CURVE == "libsodium" ]; then

if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
(command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
git clone --depth 1 -b stable https://github.com/jedisct1/libsodium.git
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
fi
fi
Expand Down
2 changes: 1 addition & 1 deletion builds/valgrind/ci_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ elif [ $CURVE == "libsodium" ]; then

if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
(command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
git clone --depth 1 -b stable https://github.com/jedisct1/libsodium.git
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
fi
fi
Expand Down
2 changes: 1 addition & 1 deletion config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function set_config_opts() {

if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
(command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
git clone --depth 1 -b stable https://github.com/jedisct1/libsodium.git
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
fi
fi
Expand Down

0 comments on commit ec6f3b1

Please sign in to comment.