From f1d4ba280a03abff758cc16866a840a344fd321f Mon Sep 17 00:00:00 2001 From: jswhit Date: Thu, 31 Dec 2020 10:29:33 -0700 Subject: [PATCH 1/2] try building curl and openssl on macosx --- config.sh | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/config.sh b/config.sh index 7624863..115a8ee 100644 --- a/config.sh +++ b/config.sh @@ -15,13 +15,13 @@ source h5py-wheels/config.sh function build_libs { build_hdf5 - #build_curl + build_curl # use built-in curl on OSX - if [ -z "$IS_OSX" ]; then - build_curl - else - touch curl-stamp - fi + #if [ -z "$IS_OSX" ]; then + # build_curl + #else + # touch curl-stamp + #fi if [ -z "$IS_OSX" ] && [ $MB_ML_VER -eq 1 ]; then export CFLAGS="-std=gnu99 -Wl,-strip-all" fi @@ -38,3 +38,17 @@ function run_tests { python run_all.py } +function build_curl { + if [ -e curl-stamp ]; then return; fi + local flags="--prefix=$BUILD_PREFIX -with-ssl" + build_openssl + fetch_unpack https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz + (cd curl-${CURL_VERSION} \ + && if [ -z "$IS_OSX" ]; then \ + LIBS=-ldl ./configure $flags; else \ + ./configure $flags; fi\ + && make -j4 \ + && make install) + touch curl-stamp +} + From 574f4b0d4c60dda06aae1f43d4f86ee25902a64f Mon Sep 17 00:00:00 2001 From: jswhit Date: Thu, 31 Dec 2020 10:42:39 -0700 Subject: [PATCH 2/2] update --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 115a8ee..eb6cdb9 100644 --- a/config.sh +++ b/config.sh @@ -40,7 +40,7 @@ function run_tests { function build_curl { if [ -e curl-stamp ]; then return; fi - local flags="--prefix=$BUILD_PREFIX -with-ssl" + local flags="--prefix=$BUILD_PREFIX -with-ssl=$BUILD_PREFIX" build_openssl fetch_unpack https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz (cd curl-${CURL_VERSION} \