Changeset 27149


Ignore:
Timestamp:
07/07/22 11:36:09 (3 years ago)
Author:
jdquinn
Message:

BUG: Correcting some static linking in distributables; syntax of sed call under Linux in packaging scripts

Location:
issm/trunk-jpl
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/gdal/install-3-python-static.sh

    r25967 r27149  
    4343        --with-pic \
    4444        --with-python \
     45        --with-curl="${CURL_ROOT}/bin/curl-config" \
     46        --with-hdf5="${HDF5_ROOT}" \
    4547        --with-libz="${ZLIB_ROOT}" \
    46         --with-hdf5="${HDF5_ROOT}" \
    4748        --with-netcdf="${NETCDF_ROOT}" \
    48         --with-proj="${PROJ_ROOT}" \
    49         --with-pg=no
     49        --with-pg=no \
     50        --with-proj="${PROJ_ROOT}"
    5051
    5152# Compile and install

  • issm/trunk-jpl/externalpackages/gdal/install-3-python.sh

    r25967 r27149  
    3535        --enable-fast-install \
    3636        --with-python \
     37        --with-hdf5="${HDF5_ROOT}" \
    3738        --with-libz="${ZLIB_ROOT}" \
    38         --with-hdf5="${HDF5_ROOT}" \
    3939        --with-netcdf="${NETCDF_ROOT}" \
    4040        --with-proj="${PROJ_ROOT}"

  • issm/trunk-jpl/externalpackages/gdal/install-3-static.sh

    r25967 r27149  
    4242        --enable-static \
    4343        --with-pic \
     44        --with-curl="${CURL_ROOT}/bin/curl-config" \
     45        --with-hdf5="${HDF5_ROOT}" \
    4446        --with-libz="${ZLIB_ROOT}" \
    45         --with-hdf5="${HDF5_ROOT}" \
    4647        --with-netcdf="${NETCDF_ROOT}" \
    47         --with-proj="${PROJ_ROOT}" \
    48         --with-pg=no
     48        --with-pg=no \
     49        --with-proj="${PROJ_ROOT}"
    4950
    5051# Compile and install

  • issm/trunk-jpl/externalpackages/gdal/install-3.sh

    r25967 r27149  
    3030        --prefix="${PREFIX}" \
    3131        --enable-fast-install \
     32        --with-hdf5="${HDF5_ROOT}" \
    3233        --with-libz="${ZLIB_ROOT}" \
    33         --with-hdf5="${HDF5_ROOT}" \
    3434        --with-netcdf="${NETCDF_ROOT}" \
    3535        --with-proj="${PROJ_ROOT}"

  • issm/trunk-jpl/externalpackages/gmsh/install-4-static.sh

    r25971 r27149  
    5555        -DENABLE_OCC=0 \
    5656        -DENABLE_TOUCHBAR=0 \
     57        -DBLAS_LAPACK_LIBRARIES="-L${LAPACK_ROOT}/lib -lflapack -L${BLAS_ROOT}/lib -lfblas /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libgfortran.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/libquadmath.a /usr/local/Cellar/gcc/11.3.0/lib/gcc/11/gcc/x86_64-apple-darwin15/11/libgcc.a" \
    5758        -DMETIS_ROOT="${METIS_ROOT}"
    5859

  • issm/trunk-jpl/externalpackages/gmsh/install-4.sh

    r25971 r27149  
    5353        -DENABLE_OCC=0 \
    5454        -DENABLE_TOUCHBAR=0 \
     55        -DBLAS_LAPACK_LIBRARIES="-L${LAPACK_ROOT}/lib -lflapack -L${BLAS_ROOT}/lib -lfblas" \
    5556        -DMETIS_ROOT="${METIS_ROOT}"
    5657

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

    r27148 r27149  
    145145
    146146        # Check that all tests passed
    147         sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" matlab.log # First, need to remove WindowServer error message
     147        sed -i "/FAILED TO establish the default connection to the WindowServer/d" matlab.log # First, need to remove WindowServer error message
    148148        numTestsFailed=`grep -c -E "FAILED|ERROR" matlab.log`
    149149

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

    r27148 r27149  
    144144
    145145        # Check that all tests passed
    146         sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
     146        sed -i "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
    147147        numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
    148148

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

    r27148 r27149  
    147147
    148148        # Check that all tests passed
    149         sed -i '' "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
     149        sed -i "/FAILED TO establish the default connection to the WindowServer/d" python.log # First, need to remove WindowServer error message
    150150        numTestsFailed=`grep -c -E "FAILED|ERROR" python.log`
    151151
Note: See TracChangeset for help on using the changeset viewer.