updated gcc to version 4.9.0, tested FEniCS 1.3.0(unstable) with gcc-4.9.0/openmpi...

diff --git a/gcc/packages/gcc.package b/gcc/packages/gcc.package
index 279fe2ee6348d3c3664df612a8e604a7055b9aee..e1d49a426ab99dcfc5473307c563350c41892953 100644 (file)
--- a/gcc/packages/gcc.package
+++ b/gcc/packages/gcc.package
@@ -9,6 +9,8 @@ if [ ${GCC} = "4.7.3" ]; then
     CHECKSUM=d518eace24a53aef59c2c69498ea4989
 elif [ ${GCC} = "4.8.2" ]; then
     CHECKSUM=deca88241c1135e2ff9fa5486ab5957b
+elif [ ${GCC} = "4.9.0" ]; then
+    CHECKSUM=fe8786641134178ecfeee2dc7644a0d8
 fi
 
 MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/compiler/gcc

diff --git a/local-DTM++.toolbox.cfg b/local-DTM++.toolbox.cfg
index 2fddbac9bebd134c178ca816ee2e6d92ff95ed8a..dd7130f440089155cf3cced49177293955c92341 100644 (file)
--- a/local-DTM++.toolbox.cfg
+++ b/local-DTM++.toolbox.cfg
@@ -6,8 +6,7 @@
 # Meta-project to build
 PROJECT=DTM++.toolbox
 CLEAN_BUILD=false
-#COMPILER=native-openmpi
-COMPILER=llvm-mpich2-1.4.1p1
+COMPILER=native-openmpi
 # How many processes would you like to build using?
 PROCS=1
 

diff --git a/local-FEniCS.cfg b/local-FEniCS.cfg
index 6ad2087ef5127cf6dca20ef574927da5552a565b..8e0ca080c73405ac93976afa1e0537927f39b3bc 100644 (file)
--- a/local-FEniCS.cfg
+++ b/local-FEniCS.cfg
@@ -7,6 +7,7 @@
 PROJECT=FEniCS
 CLEAN_BUILD=false
 COMPILER=native-openmpi
+#COMPILER=gcc-4.9.0-openmpi-1.6.5
 
 PREFIX_PATH=~/apps/candi
 
@@ -30,3 +31,4 @@ PROCS=1
 STABLE_BUILD=false
 # Would you like to use snapshots when using STABLE_BUILD=false?
 USE_SNAPSHOTS=false
+

diff --git a/local-gcc.cfg b/local-gcc.cfg
index 7295ec22115c8db757e1068b39fd1c6aca4bc430..2da7c27f3b2f35dab407d5476f36efdef5b08058 100644 (file)
--- a/local-gcc.cfg
+++ b/local-gcc.cfg
@@ -6,7 +6,8 @@
 # Meta-project to build
 PROJECT=gcc
 #VERSION=4.7.3
-VERSION=4.8.2
+#VERSION=4.8.2
+VERSION=4.9.0
 
 # How many processes would you like to build using?
 PROCS=1
@@ -20,7 +21,7 @@ DOWNLOAD_PATH=${PREFIX_PATH}/src
 UNPACK_PATH=${PREFIX_PATH}/unpack
 
 # Where do you want the build files to go?
-BUILD_PATH=${PREFIX_PATH}/compiler/${PROJECT}-${VERSION}-build
+BUILD_PATH=${PREFIX_PATH}/compiler/${PROJECT}/${VERSION}-build
 
 # Where do you want the compiled software installed?
 INSTALL_PATH=${PREFIX_PATH}/compiler/${PROJECT}/${VERSION}

diff --git a/local-mpi.cfg b/local-mpi.cfg
index 4805fe8a15541c6ef7cd8d7fe2b9621c9ebac25c..34697517542bc20ffc624abf84f131a82dbaf7b1 100644 (file)
--- a/local-mpi.cfg
+++ b/local-mpi.cfg
@@ -6,7 +6,8 @@
 # Meta-project to build
 PROJECT=mpi
 #COMPILER=llvm
-COMPILER=gcc-4.8.2
+#COMPILER=gcc-4.8.2
+COMPILER=gcc-4.9.0
 
 # How many processes would you like to build using?
 PROCS=1
@@ -17,11 +18,11 @@ PREFIX_PATH=~/apps/candi
 DOWNLOAD_PATH=${PREFIX_PATH}/src
 
 # Where do you want the build files to go?
-BUILD_PATH=${PREFIX_PATH}/${PROJECT}/${COMPILER}-build
+BUILD_PATH=${PREFIX_PATH}/compiler/${PROJECT}/${COMPILER}-build
 
 # Where do you want to unpack source files to go?
 UNPACK_PATH=${PREFIX_PATH}/unpack
 
 # Where do you want the compiled software installed?
-INSTALL_PATH=${PREFIX_PATH}/compiler/${PROJECT}
+INSTALL_PATH=${PREFIX_PATH}/compiler/${PROJECT}/${COMPILER}
 

diff --git a/mpi/packages/openmpi.package b/mpi/packages/openmpi.package
index 843c3779f60a5dc021d7b8a4a50ec71152b14025..0e0607e8dc36182be9ae34be3988ac9a02eb7507 100644 (file)
--- a/mpi/packages/openmpi.package
+++ b/mpi/packages/openmpi.package
@@ -9,6 +9,7 @@ PROCS=1
 #CONFOPTS="--disable-dlopen"
 TARGETS=('' all install)
 
+INSTALL_PATH=${INSTALL_PATH}/${NAME}
 MODULEFILE_PATH=${INSTALL_PATH}/conf/modulefiles/compiler/mpi/${COMPILER}
 CONFIG_FILE=${MODULEFILE_PATH}/${NAME}
 
@@ -33,31 +34,31 @@ prepend-path                LD_RUN_PATH     ${LD_RUN_PATH}
 setenv                 LIBDIR          ${LIBDIR}
 setenv                 LDFLAGS         \"${LDFLAGS}\"
 
-prepend-path           PATH            ${INSTALL_PATH}/${COMPILER}/${NAME}/bin
-prepend-path           LD_LIBRARY_PATH ${INSTALL_PATH}/${COMPILER}/${NAME}/lib
-prepend-path           MANPATH         ${INSTALL_PATH}/${COMPILER}/${NAME}/share/man
+prepend-path           PATH            ${INSTALL_PATH}/bin
+prepend-path           LD_LIBRARY_PATH ${INSTALL_PATH}/lib
+prepend-path           MANPATH         ${INSTALL_PATH}/share/man
 
-setenv                 MPI_BIN         ${INSTALL_PATH}/${COMPILER}/${NAME}/bin
-setenv                 MPI_SYSCONFIG   ${INSTALL_PATH}/${COMPILER}/${NAME}/etc
-setenv                 MPI_INCLUDE     ${INSTALL_PATH}/${COMPILER}/${NAME}/include
-setenv                 MPI_LIB         ${INSTALL_PATH}/${COMPILER}/${NAME}/lib
-setenv                 MPI_MAN         ${INSTALL_PATH}/${COMPILER}/${NAME}/share/man
+setenv                 MPI_BIN         ${INSTALL_PATH}/bin
+setenv                 MPI_SYSCONFIG   ${INSTALL_PATH}/etc
+setenv                 MPI_INCLUDE     ${INSTALL_PATH}/include
+setenv                 MPI_LIB         ${INSTALL_PATH}/lib
+setenv                 MPI_MAN         ${INSTALL_PATH}/share/man
 setenv                 MPI_COMPILER    openmpi-x86_64
 setenv                 MPI_SUFFIX      _openmpi
-setenv                 MPI_HOME        ${INSTALL_PATH}/${COMPILER}/${NAME}
+setenv                 MPI_HOME        ${INSTALL_PATH}
 
-setenv                 CC              ${INSTALL_PATH}/${COMPILER}/${NAME}/bin/mpicc
-setenv                 CXX             ${INSTALL_PATH}/${COMPILER}/${NAME}/bin/mpic++
-setenv                 FC              ${INSTALL_PATH}/${COMPILER}/${NAME}/bin/mpif90
-setenv                 FF              ${INSTALL_PATH}/${COMPILER}/${NAME}/bin/mpif77
-setenv                 F90             ${INSTALL_PATH}/${COMPILER}/${NAME}/mpif90
-setenv                 F77             ${INSTALL_PATH}/${COMPILER}/${NAME}/bin/mpif77
+setenv                 CC              ${INSTALL_PATH}/bin/mpicc
+setenv                 CXX             ${INSTALL_PATH}/bin/mpic++
+setenv                 FC              ${INSTALL_PATH}/bin/mpif90
+setenv                 FF              ${INSTALL_PATH}/bin/mpif77
+setenv                 F90             ${INSTALL_PATH}/bin/mpif90
+setenv                 F77             ${INSTALL_PATH}/bin/mpif77
 " >> $CONFIG_FILE
 
     echo
     echo "${NAME} has now been installed in"
     echo
-    cecho ${GOOD} "    ${INSTALL_PATH}/${COMPILER}/${NAME}"
+    cecho ${GOOD} "    ${INSTALL_PATH}"
     echo
     echo "To update your environment variables, use the created modulefile:"
     echo

diff --git a/mpi/platforms/supported/fedora20.platform b/mpi/platforms/supported/fedora20.platform
index b3e3fdbe0c50b80c9f864c73c36c27cea9582283..e72b2f0e8d3e9714bd9525f43a09cc7cc18370e6 100644 (file)
--- a/mpi/platforms/supported/fedora20.platform
+++ b/mpi/platforms/supported/fedora20.platform
@@ -7,7 +7,7 @@
 
 # Define the packages this platform needs
 PACKAGES=(
-once:mpich2
-once:mpich
+#once:mpich2
+#once:mpich
 once:openmpi
 )