Skip to content

Commit ba62c5e

Browse files
author
Jeff Whitaker
committed
build openssl 3.0.1, use default multibuild build script for curl
1 parent 32d4de5 commit ba62c5e

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

config.sh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export MACOSX_DEPLOYMENT_TARGET="10.9"
1515
export NETCDF_VERSION="4.9.1"
1616
export HDF5_VERSION="1.12.2"
1717
# old openssl, since building new version requires perl 5.10.0
18-
#export OPENSSL_ROOT=openssl-1.1.1s
19-
#export OPENSSL_HASH=ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16
18+
export OPENSSL_ROOT=openssl-3.0.1
19+
export OPENSSL_HASH=c311ad853353bce796edad01a862c50a8a587f62e7e2100ef465ab53ec9b06d1
2020
export CURL_VERSION="8.0.1"
2121
export LIBAEC_VERSION="1.0.6"
2222
export ZSTD_VERSION="1.5.2"
@@ -40,25 +40,25 @@ function pip_opts {
4040
fi
4141
}
4242

43-
function build_curl {
44-
if [ -e curl-stamp ]; then return; fi
45-
local flags="--prefix=$BUILD_PREFIX"
46-
if [ -n "$IS_MACOS" ]; then
47-
flags="$flags --with-darwinssl"
48-
else # manylinux
49-
flags="$flags --with-ssl"
50-
build_openssl
51-
fi
52-
flags="$flags --without-brotli --without-nghttp2 --without-zstd --without-librtmp --without-libidn2"
53-
fetch_unpack https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz
54-
(cd curl-${CURL_VERSION} \
55-
&& if [ -z "$IS_MACOS" ]; then \
56-
LIBS=-ldl ./configure $flags; else \
57-
./configure $flags; fi\
58-
&& make -j4 \
59-
&& make install)
60-
touch curl-stamp
61-
}
43+
#function build_curl {
44+
# if [ -e curl-stamp ]; then return; fi
45+
# local flags="--prefix=$BUILD_PREFIX"
46+
# if [ -n "$IS_MACOS" ]; then
47+
# flags="$flags --with-darwinssl"
48+
# else # manylinux
49+
# flags="$flags --with-ssl"
50+
# build_openssl
51+
# fi
52+
# flags="$flags --without-brotli --without-nghttp2 --without-zstd --without-librtmp --without-libidn2"
53+
# fetch_unpack https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz
54+
# (cd curl-${CURL_VERSION} \
55+
# && if [ -z "$IS_MACOS" ]; then \
56+
# LIBS=-ldl ./configure $flags; else \
57+
# ./configure $flags; fi\
58+
# && make -j4 \
59+
# && make install)
60+
# touch curl-stamp
61+
#}
6262

6363
function build_libaec {
6464
if [ -e libaec-stamp ]; then return; fi
@@ -281,7 +281,7 @@ function run_tests {
281281
which python
282282
cp ../netcdf4-python/test/* .
283283
python run_all.py
284-
# add test for issue #1246
284+
# add test for issue #1246 (opendap with ssl)
285285
filename='https://icdc.cen.uni-hamburg.de/thredds/dodsC/ftpthredds/hamtide//m2.hamtide11a.nc'
286286
python -c "from netCDF4 import Dataset; nc=Dataset(\"${filename}\"); print(nc)"
287287
}

0 commit comments

Comments
 (0)