From 5a62f0006a5ccd1d1ee7fb2261fd0f780bff660d Mon Sep 17 00:00:00 2001 From: Elke Flehmig Date: Wed, 16 Apr 2014 09:26:53 +0000 Subject: [PATCH] version updates --- packages/numlib/parmetis/4.0.3 | 4 ++-- packages/numlib/scotch/6.0.0 | 8 ++++---- packages/numlib/scotch/6.0.0_Makefile.inc_patch_cray | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/numlib/parmetis/4.0.3 b/packages/numlib/parmetis/4.0.3 index ce58c75..476e7ef 100755 --- a/packages/numlib/parmetis/4.0.3 +++ b/packages/numlib/parmetis/4.0.3 @@ -4,10 +4,10 @@ # Christoph Niethammer (C) 2012 # # laki sit command: -# PREFIX_BASE=/opt COMPILER=gnu COMPILER_VERSION=4.7.3 MPI=openmpi MPI_VERSION=1.6.5 ./sit numlib/parmetis/4.0.3 +# PREFIX_BASE=/opt COMPILER=gnu COMPILER_VERSION=4.8.1 MPI=openmpi MPI_VERSION=1.6.5 ./sit numlib/parmetis/4.0.3 # # hermit sit command: -# PREFIX_BASE=/opt/hlrs ./sit numlib/parmetis/4.0.3 +# PREFIX_BASE=/opt/hlrs COMPILER=pgi COMPILER_VERSION=13.10.0 ./sit numlib/parmetis/4.0.3 CATEGORY="numlib" PACKAGE="parmetis" diff --git a/packages/numlib/scotch/6.0.0 b/packages/numlib/scotch/6.0.0 index fb9e5de..3fafddc 100755 --- a/packages/numlib/scotch/6.0.0 +++ b/packages/numlib/scotch/6.0.0 @@ -4,10 +4,10 @@ # Christoph Niethammer (C) 2012 # # laki sit command: -# PREFIX_BASE=/opt COMPILER=gnu COMPILER_VERSION=4.7.3 MPI=openmpi MPI_VERSION=1.6.5 ./sit numlib/scotch/6.0.0 +# PREFIX_BASE=/opt COMPILER=gnu COMPILER_VERSION=4.8.1 MPI=openmpi MPI_VERSION=1.6.5 ./sit numlib/scotch/6.0.0 # # hermit sit command: -# PREFIX_BASE=/opt/hlrs ./sit numlib/scotch/6.0.0 +# PREFIX_BASE=/opt/hlrs COMPILER=pgi COMPILER_VERSION=13.10.0 ./sit numlib/scotch/6.0.0 CATEGORY="numlib" PACKAGE="scotch" @@ -25,11 +25,11 @@ src_prepare() { case $PLATFORM in hermit|hermit1) # there are some GNU extensions Cray compiler doesn't (yet) know about - module swap PrgEnv-cray PrgEnv-gnu +# module swap PrgEnv-cray PrgEnv-gnu echo "Building for hermit." # link most fitting Makefile.inc sample: cd $SRCDIR - ln -s Make.inc/Makefile.inc.x86-64_cray-xt4_linux2 Makefile.inc + cp Make.inc/Makefile.inc.x86-64_cray-xt4_linux2 Makefile.inc echo "Linking Makefile.inc in $SRCDIR" # adjust CFLAGS: # remove not working options: -c99 -fast -fastsse diff --git a/packages/numlib/scotch/6.0.0_Makefile.inc_patch_cray b/packages/numlib/scotch/6.0.0_Makefile.inc_patch_cray index 993ed7d..fef2dc2 100644 --- a/packages/numlib/scotch/6.0.0_Makefile.inc_patch_cray +++ b/packages/numlib/scotch/6.0.0_Makefile.inc_patch_cray @@ -1,4 +1,4 @@ 12c12 < CFLAGS = -O3 -c99 -fast -fastsse -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME -DIDXSIZE64 --- -> CFLAGS = -O3 -std=gnu99 -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DIDXSIZE64 -DINTSIZE64 -DCOMMON_MEMORY_TRACE -DSCOTCH_METIS_PREFIX +> CFLAGS = -O3 -c99 -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DIDXSIZE64 -DINTSIZE64 -DCOMMON_MEMORY_TRACE -DSCOTCH_METIS_PREFIX