Skip to content

Commit 1e8e6e0

Browse files
committed
configure: OpenSSL URLs changed, and propagate http error code when curl fails
1 parent ca3dc47 commit 1e8e6e0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

mklove/modules/configure.libssl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,17 @@ if [[ $MKL_DISTRO != osx ]]; then
8080
local name=$1
8181
local destdir=$2
8282
local ver=1.0.2u
83+
local url=https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz
8384

8485
local conf_args="--openssldir=/usr/lib/ssl no-shared no-zlib"
8586
if [[ $ver == 1.0.* ]]; then
8687
extra_conf_args="${extra_conf_args} no-krb5"
8788
fi
8889

89-
echo "### Installing $name $ver from source to $destdir"
90+
echo "### Installing $name $ver from source ($url) to $destdir"
9091
if [[ ! -f config ]]; then
9192
echo "### Downloading"
92-
curl -sL https://www.openssl.org/source/openssl-${ver}.tar.gz | \
93-
tar xzf - --strip-components 1
93+
curl -fL $url | tar xzf - --strip-components 1
9494
fi
9595

9696
echo "### Configuring"

mklove/modules/configure.libzstd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function install_source {
4343

4444
echo "### Installing $name $ver from source to $destdir"
4545
if [[ ! -f Makefile ]]; then
46-
curl -sL https://github.com/facebook/zstd/releases/download/v${ver}/zstd-${ver}.tar.gz | \
46+
curl -fL https://github.com/facebook/zstd/releases/download/v${ver}/zstd-${ver}.tar.gz | \
4747
tar xzf - --strip-components 1
4848
fi
4949

mklove/modules/configure.zlib

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function install_source {
3838

3939
echo "### Installing $name $ver from source to $destdir"
4040
if [[ ! -f Makefile ]]; then
41-
curl -sL https://zlib.net/zlib-${ver}.tar.gz | \
41+
curl -fL https://zlib.net/zlib-${ver}.tar.gz | \
4242
tar xzf - --strip-components 1
4343
fi
4444

0 commit comments

Comments
 (0)