Changeset 28189


Ignore:
Timestamp:
03/26/24 19:44:20 (12 months ago)
Author:
jdquinn
Message:

CHG: Need to link GMT differently and add more libraries to distributable

Location:
issm/trunk-jpl
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r28184 r28189  
    6767cmake \
    6868        -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
    69         -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a;${LIBGCC}" \
     69        -DBLAS_LIBRARIES="${BLAS_ROOT}/lib/libfblas.a;$-L${LIBGFORTRAN_ROOT};-lgfortran" \
    7070        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
    7171        -DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a" \

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh

    r28175 r28189  
    3333LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
    3434LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
     35LIBQUADMATH="/usr/lib/x86_64-linux-gnu/libquadmath.so.0.0.0" # Important that this is the library itself
     36LIBQUADMATH_DIST="${ISSM_DIR}/lib/libquadmath.so.0" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    3537
    3638## Environment
    … …  
    7274cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
    7375
    74 echo "Moving libgfortran to lib/"
     76echo "Moving libgfortran and libquadmath to lib/"
    7577cp ${LIBGFORTRAN} ${LIBGFORTRAN_DIST} 2> /dev/null
     78cp ${LIBQUADMATH} ${LIBQUADMATH_DIST} 2> /dev/null
    7679
    7780echo "Moving MPICH binaries to bin/"

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh

    r28175 r28189  
    3333LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
    3434LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
     35LIBQUADMATH="/usr/lib/x86_64-linux-gnu/libquadmath.so.0.0.0" # Important that this is the library itself
     36LIBQUADMATH_DIST="${ISSM_DIR}/lib/libquadmath.so.0" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
    3537
    3638## Environment
    … …  
    6668cat generic_static.py | sed -e "s/generic_static/generic/g" > generic.py
    6769
    68 echo "Moving libgfortran to lib/"
     70echo "Moving libgfortran and libquadmath to lib/"
    6971cp ${LIBGFORTRAN} ${LIBGFORTRAN_DIST} 2> /dev/null
     72cp ${LIBQUADMATH} ${LIBQUADMATH_DIST} 2> /dev/null
    7073
    7174echo "Moving MPICH binaries to bin/"
Note: See TracChangeset for help on using the changeset viewer.