Changeset 25868

Timestamp:

12/14/20 13:29:34 (4 years ago)

Author:

jdquinn

Message:

BUG: Fix for cURL + GMT on macOS binaries

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (3 diffs)
• externalpackages/curl/install-7-linux-static.sh (modified) (1 diff)
• externalpackages/curl/install-7-linux-with_tests.sh (modified) (1 diff)
• externalpackages/curl/install-7-linux.sh (modified) (1 diff)
• externalpackages/curl/install-7-mac-static.sh (modified) (1 diff)
• externalpackages/curl/install-7-mac.sh (modified) (1 diff)
• externalpackages/gmt/configs/6/static/cmake/ConfigUser.static.cmake (modified) (1 diff)
• externalpackages/gmt/install-6-mac-static.sh (modified) (1 diff)

issm/trunk-jpl/etc/environment.sh

@@ -251 +251 @@
 fi
 
-LAPACK_ROOT="${ISSM_EXT_DIR}/lapack/install"
+# NOTE: Check *must* come before PETSc as we prefer packages installed via 
+#               PETSc
+#
+LAPACK_ROOT="${ISSM_DIR}/lapack/install"
 if [ -d "${LAPACK_ROOT}" ]; then
         ld_library_path_append "${LAPACK_ROOT}/lib"
+fi
+
+# NOTE: Check *must* come before PETSc as we prefer packages installed via 
+#               PETSc
+#
+ZLIB_ROOT="${ISSM_DIR}/zlib/install"
+if [ -d "${ZLIB_ROOT}" ]; then
+        export ZLIB_ROOT # Used in installation of NetCDF, GDAL, GMT
+        ld_library_path_append "${ZLIB_ROOT}/lib"
 fi
 
@@ -302 +314 @@
         if ls ${PETSC_ROOT}/lib/libz.* 1> /dev/null 2>&1; then
                 export ZLIB_ROOT="${PETSC_ROOT}" # Used in installation of NetCDF, GDAL
+                ld_library_path_append "${PETSC_ROOT}/lib"
         fi
 fi
@@ -389 +402 @@
 fi
 
-ZLIB_ROOT="${ISSM_EXT_DIR}/zlib/install"
-if [ -d "${ZLIB_ROOT}" ]; then
-        export ZLIB_ROOT # Used in installation of NetCDF, GDAL, GMT
-fi
-
 SQLITE_ROOT="${ISSM_EXT_DIR}/sqlite/install"
 if [ -d "${SQLITE_ROOT}" ]; then

issm/trunk-jpl/externalpackages/curl/install-7-linux-static.sh

@@ -31 +31 @@
         --disable-manual \
         --disable-verbose \
+        --disable-ldap \
+        --disable-ldaps \
+        --with-zlib="${ZLIB_ROOT}" \
         --without-libidn2
 

issm/trunk-jpl/externalpackages/curl/install-7-linux-with_tests.sh

@@ -30 +30 @@
         --disable-dependency-tracking \
         --disable-manual \
-        --disable-verbose
+        --disable-verbose \
+        --with-zlib="${ZLIB_ROOT}"
 
 # Compile and install

issm/trunk-jpl/externalpackages/curl/install-7-linux.sh

@@ -30 +30 @@
         --disable-dependency-tracking \
         --disable-manual \
-        --disable-verbose
+        --disable-verbose \
+        --with-zlib="${ZLIB_ROOT}"
 
 # Compile and install

issm/trunk-jpl/externalpackages/curl/install-7-mac-static.sh

@@ -35 +35 @@
         --disable-manual \
         --disable-verbose \
+        --disable-ldap \
+        --disable-ldaps \
+        --with-zlib="${ZLIB_ROOT}" \
         --without-libidn2 \
         --with-secure-transport

issm/trunk-jpl/externalpackages/curl/install-7-mac.sh

@@ -35 +35 @@
         --disable-manual \
         --disable-verbose \
+        --with-zlib="${ZLIB_ROOT}" \
         --with-secure-transport
 

issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/ConfigUser.static.cmake

@@ -157 +157 @@
 
 # Set location of CURL (can be root directory or path to header file) [auto]:
-set (CURL_ROOT "$ENV{ISSM_DIR}/externalpackages/curl/install")
+#set (CURL_ROOT "curl_install_prefix")
 
 # Set location of GLIB component gthread [auto].  This is an optional (and

issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh

@@ -27 +27 @@
 export CC=mpicc
 export CURL_INCLUDE_DIRS="${CURL_ROOT}/include"
-export CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;-framework CoreFoundation;-framework Security;-lldap;-lz"
+export CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;${ZLIB_ROOT}/lib/libz.a"
+export LDFLAGS="-framework CoreFoundation -framework Security"
 export PREFIX="${ISSM_DIR}/externalpackages/gmt/install" # NOTE: Need to export this to be picked up by customized ConfigUser.cmake (see below). Set to location where external package should be installed.