Changeset 24654

Timestamp:

03/11/20 20:39:49 (5 years ago)

Author:

jdquinn

Message:

CHG: Support for shared libraries in Boost and Dakota.

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (1 diff)
• externalpackages/dakota/install-6.2-mac.sh (modified) (3 diffs)
• src/wrappers/matlab/Makefile.am (modified) (1 diff)
• src/wrappers/python/Makefile.am (modified) (1 diff)

issm/trunk-jpl/etc/environment.sh

@@ -224 +224 @@
 DAKOTA_DIR="${ISSM_DIR}/externalpackages/dakota/install"
 if [ -d "${DAKOTA_DIR}" ]; then
-        path_prepend "${DAKOTA_DIR}/bin"
-        ld_library_path_prepend "${DAKOTA_DIR}/lib"
+        path_append "${DAKOTA_DIR}/bin"
+        ld_library_path_append "${DAKOTA_DIR}/lib"
         dyld_library_path_prepend "${DAKOTA_DIR}/lib"
 fi

issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh

@@ -10 +10 @@
 ## Environment
 #
-export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lfblas -L/usr/local/gfortran/lib -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
+export BLAS_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lfblas -L/usr/local/Cellar/gcc/9.2.0_1/lib/gcc/9 -lgfortran" # Need to export BLAS_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
 export BOOST_ROOT=${ISSM_DIR}/externalpackages/boost/install
 export CXXFLAGS='-std=c++98' # Setting CXXFLAGS to deal with C++11 incompatibility with Matlab's Boost (absolutely necessary for this version)
@@ -16 +16 @@
 export DAK_INSTALL=${DAK_ROOT}/install
 export DAK_SRC=${DAK_ROOT}/src
-export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lflapack -L/usr/local/gfortran/lib -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
+export LAPACK_LIBS="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lflapack -L//usr/local/Cellar/gcc/9.2.0_1/lib/gcc/9 -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
 
 # Cleanup
@@ -75 +75 @@
 sed -i -e "s/#define HAVE_MPI/\/* #define HAVE_MPI *\//g" include/Teuchos_config.h
 
+# Set install_name for all shared libraries
+cd ${DAK_INSTALL}/lib
+for name in *.dylib; do
+        install_name_tool -id ${DAK_INSTALL}/lib/${name} ${name}
+done
+
 ## Patch install names for certain libraries
 #
 # TODO: Figure out how to reconfigure source to apply these install names at compile time
 #
-install_name_tool -change libdakota_src_fortran.dylib ${DAK_INSTALL}/lib/libdakota_src_fortran.dylib lib/libdakota_src.dylib
-install_name_tool -change liblhs_mod.dylib ${DAK_INSTALL}/lib/liblhs_mod.dylib lib/liblhs.dylib
-install_name_tool -change liblhs_mods.dylib ${DAK_INSTALL}/lib/liblhs_mods.dylib lib/liblhs.dylib
-install_name_tool -change liblhs_mod.dylib ${DAK_INSTALL}/lib/liblhs_mod.dylib lib/liblhs_mods.dylib
-install_name_tool -change libteuchos.dylib ${DAK_INSTALL}/lib/libteuchos.dylib lib/liboptpp.dylib
-install_name_tool -change libdfftpack.dylib ${DAK_INSTALL}/lib/libdfftpack.dylib lib/libpecos.dylib
-install_name_tool -change liblhs_mod.dylib ${DAK_INSTALL}/lib/liblhs_mod.dylib lib/libpecos.dylib
-install_name_tool -change liblhs_mods.dylib ${DAK_INSTALL}/lib/liblhs_mods.dylib lib/libpecos.dylib
-install_name_tool -change libpecos_src.dylib ${DAK_INSTALL}/lib/libpecos_src.dylib lib/libpecos.dylib
-install_name_tool -change libteuchos.dylib ${DAK_INSTALL}/lib/libteuchos.dylib lib/libpecos.dylib
-install_name_tool -change libdfftpack.dylib ${DAK_INSTALL}/lib/libdfftpack.dylib lib/libpecos_src.dylib
-install_name_tool -change liblhs.dylib ${DAK_INSTALL}/lib/liblhs.dylib lib/libpecos_src.dylib
-install_name_tool -change liblhs_mod.dylib ${DAK_INSTALL}/lib/liblhs_mod.dylib lib/libpecos_src.dylib
-install_name_tool -change liblhs_mods.dylib ${DAK_INSTALL}/lib/liblhs_mods.dylib lib/libpecos_src.dylib
-install_name_tool -change libteuchos.dylib ${DAK_INSTALL}/lib/libteuchos.dylib lib/libpecos_src.dylib
-install_name_tool -change li
+install_name_tool -change libdakota_src_fortran.dylib ${DAK_INSTALL}/lib/libdakota_src_fortran.dylib libdakota_src.dylib
+install_name_tool -change liblhs_mod.dylib ${DAK_INSTALL}/lib/liblhs_mod.dylib liblhs.dylib
+install_name_tool -change liblhs_mods.dylib ${DAK_INSTALL}/lib/liblhs_mods.dylib liblhs.dylib
+install_name_tool -change liblhs_mod.dylib ${DAK_INSTALL}/lib/liblhs_mod.dylib liblhs_mods.dylib
+install_name_tool -change libteuchos.dylib ${DAK_INSTALL}/lib/libteuchos.dylib liboptpp.dylib
+install_name_tool -change libdfftpack.dylib ${DAK_INSTALL}/lib/libdfftpack.dylib libpecos.dylib
+install_name_tool -change liblhs.dylib ${DAK_INSTALL}/lib/liblhs.dylib libpecos.dylib
+install_name_tool -change liblhs_mod.dylib ${DAK_INSTALL}/lib/liblhs_mod.dylib libpecos.dylib
+install_name_tool -change liblhs_mods.dylib ${DAK_INSTALL}/lib/liblhs_mods.dylib libpecos.dylib
+install_name_tool -change libpecos_src.dylib ${DAK_INSTALL}/lib/libpecos_src.dylib libpecos.dylib
+install_name_tool -change libteuchos.dylib ${DAK_INSTALL}/lib/libteuchos.dylib libpecos.dylib
+install_name_tool -change libdfftpack.dylib ${DAK_INSTALL}/lib/libdfftpack.dylib libpecos_src.dylib
+install_name_tool -change liblhs.dylib ${DAK_INSTALL}/lib/liblhs.dylib libpecos_src.dylib
+install_name_tool -change liblhs_mod.dylib ${DAK_INSTALL}/lib/liblhs_mod.dylib libpecos_src.dylib
+install_name_tool -change liblhs_mods.dylib ${DAK_INSTALL}/lib/liblhs_mods.dylib libpecos_src.dylib
+install_name_tool -change libteuchos.dylib ${DAK_INSTALL}/lib/libteuchos.dylib libpecos_src.dylib
+install_name_tool -change libsurfpack_fortran.dylib ${DAK_INSTALL}/lib/libsurfpack_fortran.dylib libsurfpack.dylib

issm/trunk-jpl/src/wrappers/matlab/Makefile.am

@@ -88 +88 @@
 endif
 
+# NOTE:
+# - On Linux, We probably do not need the -static flag as long as we only
+#       generate static libraries for external packages. Dynamic system libraries
+#       will be linked to, whether we like it or not, if no static version is
+#       available.
+# - On macOC, static linking of binaries is not supported.
+#
 if STANDALONE_MODULES
+if MAC
+AM_LDFLAGS += -Wl,-rpath,'$$ORIGIN'
+else
 AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
+endif
 endif
 

issm/trunk-jpl/src/wrappers/python/Makefile.am

@@ -64 +64 @@
 endif
 
+# NOTE:
+# - On Linux, We probably do not need the -static flag as long as we only
+#       generate static libraries for external packages. Dynamic system libraries
+#       will be linked to, whether we like it or not, if no static version is
+#       available.
+# - On macOC, static linking of binaries is not supported.
+#
 if STANDALONE_MODULES
+if MAC
+AM_LDFLAGS += -Wl,-rpath,'$$ORIGIN'
+else
 AM_LDFLAGS += -Wl,-static -Wl,--disable-new-dtags -Wl,-rpath,'$$ORIGIN'
+endif
 endif