Skip to content

Commit 567c543

Browse files
committed
update
1 parent 14008a5 commit 567c543

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

config.sh

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ function pip_opts {
3535
fi
3636
}
3737

38-
3938
function build_curl {
4039
if [ -e curl-stamp ]; then return; fi
4140
local flags="--prefix=$BUILD_PREFIX"
@@ -109,21 +108,21 @@ function build_netcdf {
109108
# && ls -l $HDF5_PLUGIN_PATH )
110109
# autotools build
111110
if [[ ! -z "IS_OSX" && "$PLAT" = "arm64" ]] && [[ "$CROSS_COMPILING" = "1" ]]; then
112-
(cd netcdf-c-${NETCDF_VERSION} \
113-
&& export HDF5_PLUGIN_PATH=$BUILD_PREFIX/lib/netcdf-plugins \
114-
&& ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap --disable-plugins
115-
&& make -j4 \
116-
&& make install )
111+
(cd netcdf-c-${NETCDF_VERSION} \
112+
&& export HDF5_PLUGIN_PATH=$BUILD_PREFIX/lib/netcdf-plugins \
113+
&& ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap --disable-plugins \
114+
&& make -j4 \
115+
&& make install )
117116
else
118-
(cd netcdf-c-${NETCDF_VERSION} \
119-
&& export HDF5_PLUGIN_PATH=$BUILD_PREFIX/lib/netcdf-plugins \
120-
&& set +e \
121-
&& ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap --with-plugin-dir=$HDF5_PLUGIN_PATH \
122-
&& cat config.log \
123-
&& set -e \
124-
&& make -j4 \
125-
&& make install \
126-
&& ls -l $HDF5_PLUGIN_PATH )
117+
(cd netcdf-c-${NETCDF_VERSION} \
118+
&& export HDF5_PLUGIN_PATH=$BUILD_PREFIX/lib/netcdf-plugins \
119+
&& set +e \
120+
&& ./configure --prefix=$BUILD_PREFIX --enable-netcdf-4 --enable-shared --enable-dap --with-plugin-dir=$HDF5_PLUGIN_PATH \
121+
&& cat config.log \
122+
&& set -e \
123+
&& make -j4 \
124+
&& make install \
125+
&& ls -l $HDF5_PLUGIN_PATH )
127126
fi
128127
touch netcdf-stamp
129128
}

0 commit comments

Comments
 (0)