zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: add gcc-4.5.0, drop gcc-4.4.2, avoid gcc lib/ on 64-bit systems

Browse Source
This commit is contained in:
Mark Olesen
2010-04-16 14:00:41 +02:00
parent 5f8f105965
commit af12964ba1
2 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
etc/settings.csh
View File

@ -75,7 +75,7 @@ _foamAddLib ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}:${FOAM_LIBBI
# Compiler settings # Compiler settings
# ~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~
unset gcc_version gmp_version mpfr_version unset gcc_version gmp_version mpfr_version mpc_version
unsetenv MPFR_ARCH_PATH unsetenv MPFR_ARCH_PATH
@ -92,25 +92,22 @@ case OpenFOAM:
set gmp_version=gmp-5.0.1 set gmp_version=gmp-5.0.1
set mpfr_version=mpfr-2.4.2 set mpfr_version=mpfr-2.4.2
breaksw breaksw
case Gcc45:
case Gcc442: set gcc_version=gcc-4.5.0
set gcc_version=gcc-4.4.2 set gmp_version=gmp-5.0.1
set gmp_version=gmp-4.2.4 set mpfr_version=mpfr-2.4.2
set mpfr_version=mpfr-2.4.1 set mpc_version=mpc-2.4.2
breaksw breaksw
case Gcc44: case Gcc44:
set gcc_version=gcc-4.4.2 set gcc_version=gcc-4.4.3
set gmp_version=gmp-4.2.4 set gmp_version=gmp-5.0.1
set mpfr_version=mpfr-2.4.1 set mpfr_version=mpfr-2.4.2
breaksw breaksw
case Gcc43: case Gcc43:
set gcc_version=gcc-4.3.3 set gcc_version=gcc-4.3.3
set gmp_version=gmp-4.2.4 set gmp_version=gmp-4.2.4
set mpfr_version=mpfr-2.4.1 set mpfr_version=mpfr-2.4.1
breaksw breaksw
default: default:
echo echo
echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:" echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
@ -118,13 +115,13 @@ case OpenFOAM:
echo " Please check your settings" echo " Please check your settings"
echo echo
breaksw breaksw
endsw endsw
if ( $?gcc_version ) then if ( $?gcc_version ) then
set gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version 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 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 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 # Check that the compiler directory can be found
if ( ! -d "$gccDir" ) then if ( ! -d "$gccDir" ) then
@ -138,17 +135,30 @@ case OpenFOAM:
_foamAddMan $gccDir/man _foamAddMan $gccDir/man
_foamAddPath $gccDir/bin _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 # add in gmp/mpfr libraries
_foamAddLib $gmpDir/lib _foamAddLib $gmpDir/lib
_foamAddLib $mpfrDir/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: # used by boost/CGAL:
setenv MPFR_ARCH_PATH $mpfrDir setenv MPFR_ARCH_PATH $mpfrDir
endif 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 breaksw
endsw endsw

31
etc/settings.sh
View File

@ -99,7 +99,8 @@ _foamAddLib $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN:$FOAM_LIBBIN/dummy
# Compiler settings # 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 # Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -114,15 +115,16 @@ OpenFOAM)
gmp_version=gmp-5.0.1 gmp_version=gmp-5.0.1
mpfr_version=mpfr-2.4.2 mpfr_version=mpfr-2.4.2
;; ;;
Gcc442) Gcc45)
gcc_version=gcc-4.4.2 gcc_version=gcc-4.5.0
gmp_version=gmp-4.2.4 gmp_version=gmp-5.0.1
mpfr_version=mpfr-2.4.1 mpfr_version=mpfr-2.4.2
mpc_version=mpc-0.8.1
;; ;;
Gcc44) Gcc44)
gcc_version=gcc-4.4.2 gcc_version=gcc-4.4.3
gmp_version=gmp-4.2.4 gmp_version=gmp-5.0.1
mpfr_version=mpfr-2.4.1 mpfr_version=mpfr-2.4.2
;; ;;
Gcc43) Gcc43)
gcc_version=gcc-4.3.3 gcc_version=gcc-4.3.3
@ -143,6 +145,7 @@ OpenFOAM)
gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version 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 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 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 # Check that the compiler directory can be found
[ -d "$gccDir" ] || { [ -d "$gccDir" ] || {
@ -156,22 +159,30 @@ OpenFOAM)
_foamAddMan $gccDir/man _foamAddMan $gccDir/man
_foamAddPath $gccDir/bin _foamAddPath $gccDir/bin
_foamAddLib $gccDir/lib
# 64-bit needs lib64, but 32-bit needs lib (not lib32) # 64-bit needs lib64, but 32-bit needs lib (not lib32)
if [ "$WM_ARCH_OPTION" = 64 ] if [ "$WM_ARCH_OPTION" = 64 ]
then then
_foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH _foamAddLib $gccDir/lib$WM_COMPILER_LIB_ARCH
else
_foamAddLib $gccDir/lib
fi fi
# add in gmp/mpfr libraries # add in gmp/mpfr libraries
_foamAddLib $gmpDir/lib _foamAddLib $gmpDir/lib
_foamAddLib $mpfrDir/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: # used by boost/CGAL:
export MPFR_ARCH_PATH=$mpfrDir export MPFR_ARCH_PATH=$mpfrDir
fi 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 esac