Ignore:
Timestamp:
04/16/12 14:57:18 (13 years ago)
Author:
Mathieu Morlighem
Message:

merged trunk-jpl and trunk for revision 11994M

Location:
issm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk

  • issm/trunk/externalpackages/dakota/install-macosx64.sh

    r11237 r11995  
    2828#Configure dakota
    2929cd src
    30 ./configure \
    31         --prefix="$ISSM_TIER/externalpackages/dakota/install" \
    32         --without-graphics  \
    33         --with-pic \
    34         --disable-mpi
     30./configure \
     31   --prefix="$ISSM_TIER/externalpackages/dakota/install" \
     32   --without-graphics  \
     33   --with-pic \
     34   --disable-mpi \
     35   --with-blas="-L$ISSM_TIER/externalpackages/petsc/install/lib -lfblas " \
     36   --with-lapack="-L$ISSM_TIER/externalpackages/petsc/install/lib -lflapack -lPLAPACK "
    3537cd ..
    3638
    … …  
    4446mv temp ./src/methods/acro/packages/pebbl/src/Makefile
    4547
    46 cat ./src/methods/hopspack/src-nappspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2  -fPIC/g' > temp
     48cat ./src/methods/hopspack/src-nappspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp
    4749mv temp ./src/methods/hopspack/src-nappspack/Makefile
    4850
    … …  
    5355mv temp  ./src/methods/hopspack/src-shared/Makefile
    5456
    55 cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2  -fPIC/g' > temp
     57cat ./src/methods/hopspack/src-shared/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp
    5658mv temp  ./src/methods/hopspack/src-shared/Makefile
    5759
    … …  
    5961mv temp  ./src/methods/hopspack/src-conveyor/Makefile
    6062
    61 cat ./src/methods/hopspack/src-appspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2  -fPIC/g' > temp
     63cat ./src/methods/hopspack/src-appspack/Makefile | sed 's/CXXFLAGS = -g -O2/CXXFLAGS = -g -O2 -fPIC/g' > temp
    6264mv temp ./src/methods/hopspack/src-appspack/Makefile
    6365
    … …  
    7476mv temp  ./src/methods/acro/packages/tpl/3po/Makefile
    7577
    76 cat ./src/packages/ampl/Makefile | sed 's/CFLAGS = -g -O2/CFLAGS = -g -O2 -fPIC/g' > temp
     78cat ./src/packages/ampl/Makefile | sed 's/CFLAGS = -g -O2 -D_NONSTD_SOURCE/CFLAGS = -g -O2 -fPIC/g' > temp
    7779mv temp  ./src/packages/ampl/Makefile
    7880
Note: See TracChangeset for help on using the changeset viewer.