Skip to content

Commit 2955e21

Browse files
blucabluca
authored
Merge pull request #2324 from stephan57160/master
Problem: Android CI build fails due to LIBMICROHTTPD download failure
2 parents 1670d54 + 76ab830 commit 2955e21

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

‎bindings/jni/ci_build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android_init_dependency_root "libmicrohttpd" # Check or initialize LIBMICRO
5050
# Fetch required dependencies:
5151
[ ! -d "${LIBZMQ_ROOT}" ] && android_clone_library "LIBZMQ" "${LIBZMQ_ROOT}" "https://github.com/zeromq/libzmq.git" ""
5252
[ ! -d "${LIBCURL_ROOT}" ] && android_clone_library "LIBCURL" "${LIBCURL_ROOT}" "https://github.com/curl/curl.git" ""
53-
[ ! -d "${LIBMICROHTTPD_ROOT}" ] && android_download_library "LIBMICROHTTPD" "${LIBMICROHTTPD_ROOT}" "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz"
53+
[ ! -d "${LIBMICROHTTPD_ROOT}" ] && android_download_library "LIBMICROHTTPD" "${LIBMICROHTTPD_ROOT}" "http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz"
5454

5555
android_download_ndk
5656

‎builds/android/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ android_init_dependency_root "libmicrohttpd" # Check or initialize LIBMICRO
8383
# Fetch required dependencies:
8484
[ ! -d "${LIBZMQ_ROOT}" ] && android_clone_library "LIBZMQ" "${LIBZMQ_ROOT}" "https://github.com/zeromq/libzmq.git" ""
8585
[ ! -d "${LIBCURL_ROOT}" ] && android_clone_library "LIBCURL" "${LIBCURL_ROOT}" "https://github.com/curl/curl.git" ""
86-
[ ! -d "${LIBMICROHTTPD_ROOT}" ] && android_download_library "LIBMICROHTTPD" "${LIBMICROHTTPD_ROOT}" "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz"
86+
[ ! -d "${LIBMICROHTTPD_ROOT}" ] && android_download_library "LIBMICROHTTPD" "${LIBMICROHTTPD_ROOT}" "http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz"
8787

8888
case "$CI_TIME" in
8989
[Yy][Ee][Ss]|[Oo][Nn]|[Tt][Rr][Uu][Ee])

‎builds/cmake/ci_build.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ if ! ((command -v dpkg >/dev/null 2>&1 && dpkg -s libmicrohttpd-dev >/dev/null 2
8585
; then
8686
BASE_PWD=${PWD}
8787
cd tmp-deps
88-
wget http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz
89-
tar -xzf $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz")
90-
cd $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz" .tar.gz) || exit $?
88+
wget http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz
89+
tar -xzf $(basename "http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz")
90+
cd $(basename "http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz" .tar.gz) || exit $?
9191
CCACHE_BASEDIR=${PWD}
9292
export CCACHE_BASEDIR
9393
if [ -e autogen.sh ]; then

‎builds/rpi/build.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ if [ ! $INCREMENTAL ]; then
106106
# Clone and build dependencies
107107
BASE_PWD=${PWD}
108108
cd tmp-deps
109-
if [ ! -e $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz") ]; then
110-
$CI_TIME wget http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz
111-
tar -xzf $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz")
109+
if [ ! -e $(basename "http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz") ]; then
110+
$CI_TIME wget http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz
111+
tar -xzf $(basename "http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz")
112112
fi
113-
pushd $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz" .tar.gz)
113+
pushd $(basename "http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz" .tar.gz)
114114
(
115115
$CI_TIME ./configure "${CONFIG_OPTS[@]}"
116116
$CI_TIME make -j4

‎ci_build.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -407,9 +407,9 @@ default|default-Werror|default-with-docs|valgrind|clang-format-check)
407407
BASE_PWD=${PWD}
408408
echo "`date`: INFO: Building prerequisite 'libmicrohttpd' from tarball..." >&2
409409
cd ./tmp-deps
410-
$CI_TIME wget http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz
411-
tar -xzf $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz")
412-
cd $(basename "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz" .tar.gz) || exit $?
410+
$CI_TIME wget http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz
411+
tar -xzf $(basename "http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz")
412+
cd $(basename "http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz" .tar.gz) || exit $?
413413
CCACHE_BASEDIR=${PWD}
414414
export CCACHE_BASEDIR
415415
if [ -e autogen.sh ]; then

‎project.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</use>
2020
<use project = "nss" optional = "1" implied = "1" />
2121
<use project = "libmicrohttpd"
22-
tarball = "http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz"
22+
tarball = "http://ftpmirror.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.44.tar.gz"
2323
implied = "1" optional = "1" />
2424

2525
<check_symbol_exists symbol = "AI_V4MAPPED" include = "netdb.h" />

0 commit comments

Comments
 (0)