From af12964ba11022f751925e645f79d434ff2663a3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 16 Apr 2010 14:00:41 +0200
Subject: [PATCH] ENH: add gcc-4.5.0, drop gcc-4.4.2, avoid gcc lib/ on 64-bit
systems
---
etc/settings.csh | 42 ++++++++++++++++++++++++++----------------
etc/settings.sh | 31 +++++++++++++++++++++----------
2 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/etc/settings.csh b/etc/settings.csh
index d56788ee570..b895263ba85 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -75,7 +75,7 @@ _foamAddLib ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}:${FOAM_LIBBI
# Compiler settings
# ~~~~~~~~~~~~~~~~~
-unset gcc_version gmp_version mpfr_version
+unset gcc_version gmp_version mpfr_version mpc_version
unsetenv MPFR_ARCH_PATH
@@ -92,25 +92,22 @@ case OpenFOAM:
set gmp_version=gmp-5.0.1
set mpfr_version=mpfr-2.4.2
breaksw
-
- case Gcc442:
- set gcc_version=gcc-4.4.2
- set gmp_version=gmp-4.2.4
- set mpfr_version=mpfr-2.4.1
+ case Gcc45:
+ set gcc_version=gcc-4.5.0
+ set gmp_version=gmp-5.0.1
+ set mpfr_version=mpfr-2.4.2
+ set mpc_version=mpc-2.4.2
breaksw
-
case Gcc44:
- set gcc_version=gcc-4.4.2
- set gmp_version=gmp-4.2.4
- set mpfr_version=mpfr-2.4.1
+ set gcc_version=gcc-4.4.3
+ set gmp_version=gmp-5.0.1
+ set mpfr_version=mpfr-2.4.2
breaksw
-
case Gcc43:
set gcc_version=gcc-4.3.3
set gmp_version=gmp-4.2.4
set mpfr_version=mpfr-2.4.1
breaksw
-
default:
echo
echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
@@ -118,13 +115,13 @@ case OpenFOAM:
echo " Please check your settings"
echo
breaksw
-
endsw
if ( $?gcc_version ) then
set gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version
set gmpDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gmp_version
set mpfrDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpfr_version
+ set mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpc_version
# Check that the compiler directory can be found
if ( ! -d "$gccDir" ) then
@@ -138,17 +135,30 @@ case OpenFOAM:
_foamAddMan $gccDir/man
_foamAddPath $gccDir/bin
- _foamAddLib $gccDir/lib${WM_COMPILER_LIB_ARCH}:$gccDir/lib
+
+ # 64-bit needs lib64, but 32-bit needs lib (not lib32)
+ if ( "$WM_ARCH_OPTION" = 64 ) then
+ then
+ _foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH
+ else
+ _foamAddLib $gccDir/lib
+ endif
# add in gmp/mpfr libraries
_foamAddLib $gmpDir/lib
_foamAddLib $mpfrDir/lib
+ # add in mpc libraries (not need for older gcc)
+ if ( $?mpc_version ) then
+ then
+ _foamAddLib $mpcDir/lib
+ endif
+
# used by boost/CGAL:
setenv MPFR_ARCH_PATH $mpfrDir
endif
- unset gcc_version gccDir gmp_version gmpDir mpfr_version mpfrDir
-
+ unset gcc_version gccDir
+ unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir
breaksw
endsw
diff --git a/etc/settings.sh b/etc/settings.sh
index abbde906b91..37ecb1f2a10 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -99,7 +99,8 @@ _foamAddLib $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN:$FOAM_LIBBIN/dummy
# Compiler settings
# ~~~~~~~~~~~~~~~~~
-unset gcc_version gmp_version mpfr_version MPFR_ARCH_PATH
+unset gcc_version gmp_version mpfr_version mpc_version
+unset MPFR_ARCH_PATH
# Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -114,15 +115,16 @@ OpenFOAM)
gmp_version=gmp-5.0.1
mpfr_version=mpfr-2.4.2
;;
- Gcc442)
- gcc_version=gcc-4.4.2
- gmp_version=gmp-4.2.4
- mpfr_version=mpfr-2.4.1
+ Gcc45)
+ gcc_version=gcc-4.5.0
+ gmp_version=gmp-5.0.1
+ mpfr_version=mpfr-2.4.2
+ mpc_version=mpc-0.8.1
;;
Gcc44)
- gcc_version=gcc-4.4.2
- gmp_version=gmp-4.2.4
- mpfr_version=mpfr-2.4.1
+ gcc_version=gcc-4.4.3
+ gmp_version=gmp-5.0.1
+ mpfr_version=mpfr-2.4.2
;;
Gcc43)
gcc_version=gcc-4.3.3
@@ -143,6 +145,7 @@ OpenFOAM)
gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version
gmpDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gmp_version
mpfrDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpfr_version
+ mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpc_version
# Check that the compiler directory can be found
[ -d "$gccDir" ] || {
@@ -156,22 +159,30 @@ OpenFOAM)
_foamAddMan $gccDir/man
_foamAddPath $gccDir/bin
- _foamAddLib $gccDir/lib
# 64-bit needs lib64, but 32-bit needs lib (not lib32)
if [ "$WM_ARCH_OPTION" = 64 ]
then
_foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH
+ else
+ _foamAddLib $gccDir/lib
fi
# add in gmp/mpfr libraries
_foamAddLib $gmpDir/lib
_foamAddLib $mpfrDir/lib
+ # add in mpc libraries (not need for older gcc)
+ if [ -n "$mpc_version" ]
+ then
+ _foamAddLib $mpcDir/lib
+ fi
+
# used by boost/CGAL:
export MPFR_ARCH_PATH=$mpfrDir
fi
- unset gcc_version gccDir gmp_version gmpDir mpfr_version mpfrDir
+ unset gcc_version gccDir
+ unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir
;;
esac
--
GitLab