Skip to content

Commit bee0724

Browse files
author
Jeff Whitaker
committed
retry
1 parent 8e93c4c commit bee0724

File tree

1 file changed

+18
-17
lines changed

1 file changed

+18
-17
lines changed

config.sh

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,6 @@ export BROTLI_VERSION="1.0.9"
1616

1717
source h5py-wheels/config.sh
1818

19-
function build_libs {
20-
build_hdf5
21-
# use built-in curl on OSX
22-
#if [ -z "$IS_OSX" ]; then
23-
# build_curl
24-
#else
25-
# touch curl-stamp
26-
#fi
27-
build_curl
28-
if [ -z "$IS_OSX" ] && [ $MB_ML_VER -eq 1 ]; then
29-
export CFLAGS="-std=gnu99 -Wl,-strip-all"
30-
fi
31-
build_netcdf
32-
}
33-
3419
function build_curl {
3520
if [ -e curl-stamp ]; then return; fi
3621
local flags="--prefix=$BUILD_PREFIX"
@@ -41,9 +26,10 @@ function build_curl {
4126
# build_openssl
4227
#fi
4328
flags="$flags --with-ssl --without-brotli --without--libnghttp2"
29+
echo "flags = $flags"
4430
build_openssl
45-
#build_libnghttp2
46-
#build_brotli
31+
build_libnghttp2
32+
build_brotli
4733
fetch_unpack https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz
4834
(cd curl-${CURL_VERSION} \
4935
&& if [ -z "$IS_MACOS" ]; then \
@@ -74,6 +60,21 @@ function build_brotli {
7460
touch brotli-stamp
7561
}
7662

63+
function build_libs {
64+
build_hdf5
65+
# use built-in curl on OSX
66+
#if [ -z "$IS_OSX" ]; then
67+
# build_curl
68+
#else
69+
# touch curl-stamp
70+
#fi
71+
build_curl
72+
if [ -z "$IS_OSX" ] && [ $MB_ML_VER -eq 1 ]; then
73+
export CFLAGS="-std=gnu99 -Wl,-strip-all"
74+
fi
75+
build_netcdf
76+
}
77+
7778
function run_tests {
7879
# Runs tests on installed distribution from an empty directory
7980
cp ../netcdf4-python/test/* .

0 commit comments

Comments
 (0)