Changeset 25271

Timestamp:

07/13/20 11:34:58 (5 years ago)

Author:

jdquinn

Message:

CHG: Minor fix and cleanup

Location:

issm/trunk-jpl/externalpackages/netcdf

Files:

• install-4.3.sh (deleted)
• install-4.7-parallel-static-with_tests.sh (modified) (2 diffs)
• install-4.7-parallel-static.sh (modified) (1 diff)
• install-4.7-parallel-with_tests.sh (modified) (2 diffs)
• install-4.7-parallel.sh (modified) (2 diffs)
• install-4.7-with_tests.sh (modified) (2 diffs)

issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-static-with_tests.sh ¶

@@ -21 +21 @@
 #
 VER="4.7.2"
+
 CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
 HDF5_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
@@ -54 +55 @@
         --disable-doxygen \
         --enable-netcdf4 \
+        --disable-examples \
         --disable-filter-testing \
         --disable-dap-remote-tests \

issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-static.sh ¶

@@ -30 +30 @@
 export CC=mpicc
 export CPPFLAGS="-I${CURL_ROOT}/include -I${HDF5_ROOT}/include -I${ZLIB_ROOT}/include"
-export LIBS="/usr/lib/x86_64-linux-gnu/libssl.a /usr/lib/x86_64-linux-gnu/libcrypto.a -L/usr/lib/x86_64-linux-gnu -ldl"
-
-export CURLLIB="${CURL_ROOT}/lib/libcurl.a"
-export HDF5LIB="${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a"
-export ZLIB="${ZLIB_ROOT}/lib/libz.a"
+export LIBS="${CURL_ROOT}/lib/libcurl.a ${HDF5_ROOT}/lib/libhdf5_hl.a ${HDF5_ROOT}/lib/libhdf5.a ${ZLIB_ROOT}/lib/libz.a /usr/lib/x86_64-linux-gnu/libssl.a /usr/lib/x86_64-linux-gnu/libcrypto.a -L/usr/lib/x86_64-linux-gnu -ldl"
 
 # Download source

issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-with_tests.sh ¶

@@ -18 +18 @@
 #
 VER="4.7.2"
+
 CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
 HDF5_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
@@ -51 +52 @@
         --disable-doxygen \
         --enable-netcdf4 \
+        --disable-examples \
         --disable-filter-testing \
         --disable-dap-remote-tests \

issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel.sh ¶

@@ -18 +18 @@
 #
 VER="4.7.2"
+
 CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
 HDF5_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
@@ -50 +51 @@
         --enable-fast-install \
         --disable-doxygen \
+        --enable-netcdf4 \
         --disable-testsets \
         --disable-examples \
-        --enable-netcdf4
+        --disable-filter-testing
 
 # Compile and install

issm/trunk-jpl/externalpackages/netcdf/install-4.7-with_tests.sh ¶

@@ -18 +18 @@
 #
 VER="4.7.2"
+
 CURL_ROOT="${ISSM_DIR}/externalpackages/curl/install"
 HDF5_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
@@ -49 +50 @@
         --enable-fast-install \
         --disable-doxygen \
+        --enable-netcdf4 \
         --disable-filter-testing \
+        --disable-examples \
         --disable-dap-remote-tests