- Update ORNL's machine specific files

This commit was SVN r21043.

contrib/platform/ornl/ornl_configure_self_contained.gnu

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Self-contained configure script, that does not rely
-# on cross-compilation, aka not need for a platforms-file.
+# on cross-compilation, aka no need for a platforms-file.
 #
 
 # Compilation should be done as VPATH
@@ -11,17 +11,17 @@ if [ -d .svn -o -f AUTHORS ] ; then
     return
 fi
 
-SRCDIR=..
+# If the env flags SRCDIR and PREFIX are not set, initialize to default...
-PREFIX=`pwd`/usr
+SRCDIR=${SRCDIR:-..}
+PREFIX=${PREFIX:-$PWD/usr}
 
 $SRCDIR/configure \
    --prefix=$PREFIX \
    --enable-static --disable-shared \
-   --with-alps=yes --with-portals=yes --with-portals-config=cnl_modex \
+   --without-tm --with-alps --with-portals --with-portals-config=cnl_modex \
    --enable-mca-no-build=maffinity-first_use,maffinity-libnuma,ess-cnos,filem-rsh,grpcomm-cnos,pml-dr \
-   --with-wrapper-ldflags='-L/opt/xt-service/default/lib/snos64/ -lportals \
+   --with-wrapper-ldflags='-L/opt/xt-service/default/lib/snos64/ -L/opt/xt-pe/default/lib/snos64/ -L/opt/xt-mpt/default/lib/snos64/' \
-                           -L/opt/xt-pe/default/lib/snos64/ -lpct \
+   --with-wrapper-libs='-lportals -lpct -lalpslli -lalpsutil' \
-                           -L/opt/xt-mpt/default/lib/snos64/ -lalpslli -lalpsutil' \
    CPPFLAGS='-I/opt/xt-pe/default/include/' \
    FFLAGS='-I/opt/xt-pe/default/include/' \
    FCFLAGS='-I/opt/xt-pe/default/include/' \

contrib/platform/ornl/ornl_configure_self_contained.pathscale

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Self-contained configure script, that does not rely
+# on cross-compilation, aka no need for a platforms-file.
+#
+
+# Compilation should be done as VPATH
+if [ -d .svn -o -f AUTHORS ] ; then
+    echo WARNING: Should not compile in source directory
+    echo Please create a directory and adapt SRCDIR in this script
+    return
+fi
+
+# If the env flags SRCDIR and PREFIX are not set, initialize to default...
+SRCDIR=${SRCDIR:-..}
+PREFIX=${PREFIX:-$PWD/usr}
+
+$SRCDIR/configure \
+   --prefix=$PREFIX \
+   --enable-static --disable-shared \
+   --without-tm --with-alps --with-portals --with-portals-config=cnl_modex \
+   --enable-mca-no-build=maffinity-first_use,maffinity-libnuma,ess-cnos,filem-rsh,grpcomm-cnos,pml-dr \
+   --with-wrapper-ldflags='-L/opt/xt-service/default/lib/snos64/ -L/opt/xt-pe/default/lib/snos64/ -L/opt/xt-mpt/default/lib/snos64/' \
+   --with-wrapper-libs='-lportals -lpct -lalpslli -lalpsutil' \
+   CC=pathcc CXX=pathCC F77=pathf90 FC=pathf90 \
+   CPPFLAGS='-I/opt/xt-pe/default/include/' \
+   FFLAGS='-I/opt/xt-pe/default/include/' \
+   FCFLAGS='-I/opt/xt-pe/default/include/' \
+   LDFLAGS='-L/opt/xt-service/default/lib/snos64/ -L/opt/xt-mpt/default/lib/snos64/' \
+   LIBS='-lportals -lalpslli -lalpsutil' | tee build.log
+
+#
+# To build orted static, use the libtool-flag -all-static
+#
+make -s -j2 orted_LDFLAGS=-all-static all | tee -a build.log
+

contrib/platform/ornl/ornl_configure_self_contained.pgi

@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Self-contained configure script, that does not rely
-# on cross-compilation, aka not need for a platforms-file.
+# on cross-compilation, aka no need for a platforms-file.
 #
 
 # Compilation should be done as VPATH
@@ -11,18 +11,17 @@ if [ -d .svn -o -f AUTHORS ] ; then
     return
 fi
 
-SRCDIR=..
+# If the env flags SRCDIR and PREFIX are not set, initialize to default...
-PREFIX=`pwd`/usr
+SRCDIR=${SRCDIR:-..}
+PREFIX=${PREFIX:-$PWD/usr}
 
 $SRCDIR/configure \
    --prefix=$PREFIX \
    --enable-static --disable-shared \
-   --with-alps=yes --with-portals=yes --with-portals-config=cnl_modex \
+   --without-tm --with-alps --with-portals --with-portals-config=cnl_modex \
    --enable-mca-no-build=maffinity-first_use,maffinity-libnuma,ess-cnos,filem-rsh,grpcomm-cnos,pml-dr \
-   --with-wrapper-ldflags='-L/opt/pgi/default/linux86-64/default/lib \
+   --with-wrapper-ldflags='-L/opt/pgi/default/linux86-64/default/lib/ -L/opt/xt-service/default/lib/snos64/ -L/opt/xt-pe/default/lib/snos64/ -L/opt/xt-mpt/default/lib/snos64/' \
-                           -L/opt/xt-service/default/lib/snos64/ -lportals \
+   --with-wrapper-libs='-lportals -lpct -lalpslli -lalpsutil' \
-                           -L/opt/xt-pe/default/lib/snos64/ -lpct \
-                           -L/opt/xt-mpt/default/lib/snos64/ -lalpslli -lalpsutil' \
    CC=pgcc CXX=pgCC F77=pgf77 FC=pgf90 \
    CPPFLAGS='-I/opt/xt-pe/default/include/' \
    FFLAGS='/opt/pgi/default/linux86-64/default/lib/pgfmain.o -I/opt/xt-pe/default/include/' \