Changeset 24929

Timestamp:

05/30/20 16:51:27 (5 years ago)

Author:

jdquinn

Message:

CHG: Corrected configuration for linking stage of static installation; cleanup.

Location:

issm/trunk-jpl/externalpackages/gdal

Files:

• install-3.0-netcdf.sh (modified) (3 diffs)
• install-3.0-python-netcdf-static.sh (modified) (4 diffs)
• install-3.0-python-netcdf.sh (modified) (3 diffs)
• install-3.0-python.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/gdal/install-3.0-netcdf.sh ¶

@@ -9 +9 @@
 NETCDF_ROOT="${ISSM_DIR}/externalpackages/netcdf/install"
 PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install"
+ZLIB_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
 
 # Cleanup
@@ -28 +29 @@
 ./configure \
         --prefix="${ISSM_DIR}/externalpackages/gdal/install" \
+        --with-libz="${ZLIB_ROOT}" \
         --with-hdf5="${HDF5_ROOT}" \
         --with-netcdf="${NETCDF_ROOT}" \
@@ -40 +42 @@
         make -j $1 install
 fi
-
-# Return to initial directory
-cd ..

issm/trunk-jpl/externalpackages/gdal/install-3.0-python-netcdf-static.sh ¶

@@ -10 +10 @@
 #
 VER="3.0.2"
+
 HDF5_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
 NETCDF_ROOT="${ISSM_DIR}/externalpackages/netcdf/install"
 PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install"
+ZLIB_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
 
 ## Environment
@@ -18 +20 @@
 export CC=mpicc
 export CXX=mpicxx
+export LDFLAGS="-L${HDF5_ROOT}/lib" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
+export LIBS="-lhdf5_hl -lhdf5" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
 
 
@@ -39 +43 @@
         --prefix="${ISSM_DIR}/externalpackages/gdal/install" \
         --disable-shared \
+        --without-ld-shared \
+        --enable-static \
+        --with-pic \
         --with-python \
+        --with-libz="${ZLIB_ROOT}" \
         --with-hdf5="${HDF5_ROOT}" \
         --with-netcdf="${NETCDF_ROOT}" \
@@ -52 +60 @@
         make -j $1 install
 fi
-
-# Return to initial directory
-cd ..

issm/trunk-jpl/externalpackages/gdal/install-3.0-python-netcdf.sh ¶

@@ -10 +10 @@
 #
 VER="3.0.2"
+
 HDF5_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
 NETCDF_ROOT="${ISSM_DIR}/externalpackages/netcdf/install"
 PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install"
+ZLIB_ROOT="${ISSM_DIR}/externalpackages/petsc/install"
 
 # Cleanup
@@ -33 +35 @@
         --prefix="${ISSM_DIR}/externalpackages/gdal/install" \
         --with-python \
+        --with-libz="${ZLIB_ROOT}" \
         --with-hdf5="${HDF5_ROOT}" \
         --with-netcdf="${NETCDF_ROOT}" \
@@ -45 +48 @@
         make -j $1 install
 fi
-
-# Return to initial directory
-cd ..

issm/trunk-jpl/externalpackages/gdal/install-3.0-python.sh ¶

@@ -43 +43 @@
         make -j $1 install
 fi
-
-# Return to initial directory
-cd ..