diff --git a/buildscripts/build_dependencies.sh b/buildscripts/build_dependencies.sh index 4193c3002..f1eb625c3 100755 --- a/buildscripts/build_dependencies.sh +++ b/buildscripts/build_dependencies.sh @@ -29,7 +29,7 @@ printf "Copying files to ${DEPENDENCY_DIR}\n" mkdir -p ${DEPENDENCY_DIR} if [ ! -d ${DEPENDENCY_DIR}/zlib-${ZLIB_VER} ]; then [ -d ${DEPENDENCY_DIR}/zlib-* ] && rm -rf ${DEPENDENCY_DIR}/zlib-* - curl -s -L https://github.com/madler/zlib/releases/download/v${ZLIB_VER}/zlib-${ZLIB_VER}.tar.gz | tar xvz - -C ${DEPENDENCY_DIR} + curl -L https://github.com/madler/zlib/releases/download/v${ZLIB_VER}/zlib-${ZLIB_VER}.tar.gz | tar xvz -C ${DEPENDENCY_DIR} fi printf "Checking if HDF5 source exists\n" @@ -45,17 +45,17 @@ if [[ (-d ${DEPENDENCY_DIR}/hdfsrc) && (-f ${DEPENDENCY_DIR}/hdfsrc/README.md) ] fi if [ ! -d ${DEPENDENCY_DIR}/hdfsrc ]; then - curl -s -L https://github.com/HDFGroup/hdf5/releases/download/hdf5-${HDF5_VER}/hdf5-${HDF5_VER}.tar.gz | tar xvz - -C ${DEPENDENCY_DIR} + curl -s -L https://github.com/HDFGroup/hdf5/releases/download/hdf5-${HDF5_VER}/hdf5-${HDF5_VER}.tar.gz | tar xvz -C ${DEPENDENCY_DIR} fi if [ ! -d ${DEPENDENCY_DIR}/netcdf-c-${NC_VER} ]; then [ -d ${DEPENDENCY_DIR}/netcdf-c-* ] && rm -rf ${DEPENDENCY_DIR}/netcdf-c-* - curl -s -L https://github.com/Unidata/netcdf-c/archive/refs/tags/v${NC_VER}.tar.gz | tar xvz - -C ${DEPENDENCY_DIR} + curl -s -L https://github.com/Unidata/netcdf-c/archive/refs/tags/v${NC_VER}.tar.gz | tar xvz -C ${DEPENDENCY_DIR} fi if [ ! -d ${DEPENDENCY_DIR}/netcdf-fortran-${NF_VER} ]; then [ -d ${DEPENDENCY_DIR}/netcdf-fortran-* ] && rm -rf ${DEPENDENCY_DIR}/netcdf-fortran-* - curl -s -L https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v${NF_VER}.tar.gz | tar xvz - -C ${DEPENDENCY_DIR} + curl -s -L https://github.com/Unidata/netcdf-fortran/archive/refs/tags/v${NF_VER}.tar.gz | tar xvz -C ${DEPENDENCY_DIR} fi cd $ROOT_DIR diff --git a/pyproject.toml b/pyproject.toml index aaf0bcd1e..d81ff9775 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ skip = "pp* *i686 *-manylinux_i686 *_ppc64le *_s390x *-musllinux* *-win32" [tool.cibuildwheel.linux] environment = {FFLAGS="${FFLAGS} -fPIC", CFLAGS="${CFLAGS} -fPIC", LDFLAGS="${LDFLAGS} -fPIE", LIBS="-lgomp"} before-all = [ - "yum install wget m4 doxygen -y || apt-get install wget m4 doxygen -y", + "yum install doxygen -y || apt-get install doxygen -y", "buildscripts/build_dependencies.sh -d /_dependencies -p /usr/local", ]