diff options
author | Patrick Lauer <patrick@gentoo.org> | 2009-04-25 16:16:35 +0000 |
---|---|---|
committer | Patrick Lauer <patrick@gentoo.org> | 2009-04-25 16:16:35 +0000 |
commit | f01967f8e551740c5b4d6b89bef532c47ee0763b (patch) | |
tree | 48cdcc26ed8609cd486ad77b1127e09400a10545 /sci-libs/openfoam-wmake/files | |
parent | Initial import from sunrise. Thanks to Oliver Borm for the ebuild and the sun... (diff) | |
download | gentoo-2-f01967f8e551740c5b4d6b89bef532c47ee0763b.tar.gz gentoo-2-f01967f8e551740c5b4d6b89bef532c47ee0763b.tar.bz2 gentoo-2-f01967f8e551740c5b4d6b89bef532c47ee0763b.zip |
Initial import from sunrise. Thanks to Oliver Borm for the ebuild and the sunrise people for massaging it into shape.
(Portage version: 2.2_rc31/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/openfoam-wmake/files')
-rw-r--r-- | sci-libs/openfoam-wmake/files/OpenFOAM-1.5-compile.patch | 397 |
1 files changed, 397 insertions, 0 deletions
diff --git a/sci-libs/openfoam-wmake/files/OpenFOAM-1.5-compile.patch b/sci-libs/openfoam-wmake/files/OpenFOAM-1.5-compile.patch new file mode 100644 index 000000000000..f95bf462f09c --- /dev/null +++ b/sci-libs/openfoam-wmake/files/OpenFOAM-1.5-compile.patch @@ -0,0 +1,397 @@ +--- OpenFOAM-1.5-src/etc/bashrc 2008-07-09 19:08:57.000000000 +0200 ++++ OpenFOAM-1.5/etc/bashrc 2008-07-21 23:07:48.000000000 +0200 +@@ -42,9 +42,9 @@ + # + # Location of FOAM installation + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-foamInstall=$HOME/$WM_PROJECT ++# foamInstall=$HOME/$WM_PROJECT + # foamInstall=~$WM_PROJECT +-# foamInstall=/usr/local/$WM_PROJECT ++foamInstall=/usr/lib/$WM_PROJECT + # foamInstall=/opt/$WM_PROJECT + + : ${FOAM_INST_DIR:=$foamInstall}; export FOAM_INST_DIR +@@ -59,7 +59,7 @@ + + # Location of third-party software + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty ++# export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty + + + # Operating System/Platform from Unix or MSWindows +@@ -192,15 +192,15 @@ + + + _foamSource $WM_PROJECT_DIR/etc/settings.sh +-_foamSource $WM_PROJECT_DIR/etc/aliases.sh ++# _foamSource $WM_PROJECT_DIR/etc/aliases.sh + + + # Source user setup files for optional packages + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/bashrc +-_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc ++# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/bashrc + # _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/bashrc +-_foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc ++# _foamSource $WM_PROJECT_DIR/etc/apps/cint/bashrc + + + # Again clean environment (path, PATH, MANPATH, LD_LIBRARY_PATH) +--- OpenFOAM-1.5-src/etc/settings.sh 2008-06-27 13:19:25.000000000 +0200 ++++ OpenFOAM-1.5/etc/settings.sh 2008-07-21 00:50:00.000000000 +0200 +@@ -56,30 +56,30 @@ + export PATH=$WM_PROJECT_DIR/bin:$FOAM_INST_DIR/$WM_ARCH/bin:$PATH + + #- Location of the jobControl directory +-export FOAM_JOB_DIR=$FOAM_INST_DIR/jobControl ++export FOAM_JOB_DIR=$HOME/$WM_PROJECT/jobControl + + export WM_DIR=$WM_PROJECT_DIR/wmake + export WM_LINK_LANGUAGE=c++ +-export WM_OPTIONS=$WM_ARCH${WM_COMPILER}$WM_PRECISION_OPTION$WM_COMPILE_OPTION ++export WM_OPTIONS=$WM_ARCH${WM_COMPILER} + export PATH=$WM_DIR:$PATH + + export FOAM_SRC=$WM_PROJECT_DIR/src + export FOAM_LIB=$WM_PROJECT_DIR/lib +-export FOAM_LIBBIN=$FOAM_LIB/$WM_OPTIONS ++export FOAM_LIBBIN=$FOAM_LIB + _foamAddLib $FOAM_LIBBIN + + export FOAM_APP=$WM_PROJECT_DIR/applications +-export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS ++export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin + _foamAddPath $FOAM_APPBIN + + export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials + export FOAM_UTILITIES=$FOAM_APP/utilities + export FOAM_SOLVERS=$FOAM_APP/solvers + +-export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib/$WM_OPTIONS ++export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/lib + _foamAddLib $FOAM_USER_LIBBIN + +-export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS ++export FOAM_USER_APPBIN=$WM_PROJECT_USER_DIR/applications/bin + _foamAddPath $FOAM_USER_APPBIN + + export FOAM_RUN=$WM_PROJECT_USER_DIR/run +@@ -93,7 +93,7 @@ + # Select compiler installation + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + # WM_COMPILER_INST = OpenFOAM | System +-WM_COMPILER_INST=OpenFOAM ++WM_COMPILER_INST=System + + case "$WM_COMPILER_INST" in + OpenFOAM) +@@ -136,45 +136,47 @@ + + case "$WM_MPLIB" in + OPENMPI) +- mpi_version=openmpi-1.2.6 +- export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version +- export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS +- ++ MPI_VERSION=openmpi ++# export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version ++# export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS ++ export MPI_ARCH_PATH=/usr + # Tell OpenMPI where to find its install directory + export OPAL_PREFIX=$MPI_ARCH_PATH + +- _foamAddLib $MPI_ARCH_PATH/lib +- _foamAddPath $MPI_ARCH_PATH/bin ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION ++# unset mpi_version + ;; + + LAM) +- mpi_version=lam-7.1.4 +- export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version +- export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS +- export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version ++ MPI_VERSION=lam ++# export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version ++# export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS ++ export MPI_ARCH_PATH=/usr ++# export LAMHOME=$WM_THIRD_PARTY_DIR/$mpi_version + # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too + +- _foamAddLib $MPI_ARCH_PATH/lib +- _foamAddPath $MPI_ARCH_PATH/bin ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION ++# unset mpi_version + ;; + + MPICH) +- mpi_version=mpich-1.2.4 +- export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version +- export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS ++ MPI_VERSION=mpich ++# export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version ++# export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS ++ export MPI_ARCH_PATH=/usr + export MPICH_ROOT=$MPI_ARCH_PATH + +- _foamAddLib $MPI_ARCH_PATH/lib +- _foamAddPath $MPI_ARCH_PATH/bin ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ export FOAM_MPI_LIBBIN=$FOAM_LIB/$MPI_VERSION ++# unset mpi_version + ;; + + MPICH-GM) +--- OpenFOAM-1.5-src/etc/cshrc 2008-07-09 19:09:28.000000000 +0200 ++++ OpenFOAM-1.5/etc/cshrc 2008-07-20 22:31:22.000000000 +0200 +@@ -58,7 +58,7 @@ + + # Location of third-party software + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +-setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty ++# setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty + + + # Operating System/Platform from Unix or MSWindows +@@ -188,12 +188,12 @@ + alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Executing: \!*"; source \!*' + + _foamSource $WM_PROJECT_DIR/etc/settings.csh +-_foamSource $WM_PROJECT_DIR/etc/aliases.csh ++# _foamSource $WM_PROJECT_DIR/etc/aliases.csh + + # Source user setup files for optional packages + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + # _foamSource $WM_PROJECT_DIR/etc/apps/paraview/cshrc +-_foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc ++# _foamSource $WM_PROJECT_DIR/etc/apps/paraview3/cshrc + # _foamSource $WM_PROJECT_DIR/etc/apps/ensightFoam/cshrc + + +--- OpenFOAM-1.5-src/etc/settings.csh 2008-06-27 13:19:25.000000000 +0200 ++++ OpenFOAM-1.5/etc/settings.csh 2008-07-20 23:14:59.000000000 +0200 +@@ -39,30 +39,30 @@ + set path=($WM_PROJECT_DIR/bin $FOAM_INST_DIR/$WM_ARCH/bin $path) + + #- Location of the jobControl directory +-setenv FOAM_JOB_DIR $FOAM_INST_DIR/jobControl ++setenv FOAM_JOB_DIR $HOME/$WM_PROJECT/jobControl + + setenv WM_DIR $WM_PROJECT_DIR/wmake + setenv WM_LINK_LANGUAGE c++ +-setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION ++setenv WM_OPTIONS $WM_ARCH$WM_COMPILER + set path=($WM_DIR $path) + + setenv FOAM_SRC $WM_PROJECT_DIR/src + setenv FOAM_LIB $WM_PROJECT_DIR/lib +-setenv FOAM_LIBBIN $FOAM_LIB/$WM_OPTIONS ++setenv FOAM_LIBBIN $FOAM_LIB + _foamAddLib $FOAM_LIBBIN + + setenv FOAM_APP $WM_PROJECT_DIR/applications +-setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS ++setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin + _foamAddPath $FOAM_APPBIN + + setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials + setenv FOAM_UTILITIES $FOAM_APP/utilities + setenv FOAM_SOLVERS $FOAM_APP/solvers + +-setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib/$WM_OPTIONS ++setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/lib + _foamAddLib $FOAM_USER_LIBBIN + +-setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin/$WM_OPTIONS ++setenv FOAM_USER_APPBIN $WM_PROJECT_USER_DIR/applications/bin + _foamAddPath $FOAM_USER_APPBIN + + setenv FOAM_RUN $WM_PROJECT_USER_DIR/run +@@ -76,7 +76,7 @@ + # Select compiler installation + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + # WM_COMPILER_INST = OpenFOAM | System +-set WM_COMPILER_INST=OpenFOAM ++set WM_COMPILER_INST=System + + switch ("$WM_COMPILER_INST") + case OpenFOAM: +@@ -125,45 +125,48 @@ + + switch ("$WM_MPLIB") + case OPENMPI: +- set mpi_version=openmpi-1.2.6 +- setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version +- setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS ++# set mpi_version=openmpi-1.2.6 ++# setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version ++# setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS ++ setenv MPI_ARCH_PATH /usr + + # Tell OpenMPI where to find its install directory + setenv OPAL_PREFIX $MPI_ARCH_PATH + +- _foamAddLib $MPI_ARCH_PATH/lib +- _foamAddPath $MPI_ARCH_PATH/bin ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ setenv FOAM_MPI_LIBBIN $FOAM_LIB/openmpi ++# unset mpi_version + breaksw + + case LAM: +- set mpi_version=lam-7.1.4 +- setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version +- setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS +- setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version ++# set mpi_version=lam-7.1.4 ++# setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version ++# setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS ++ setenv MPI_ARCH_PATH /usr ++# setenv LAMHOME $WM_THIRD_PARTY_DIR/$mpi_version + # note: LAMHOME is deprecated, should probably point to MPI_ARCH_PATH too + +- _foamAddLib $MPI_ARCH_PATH/lib +- _foamAddPath $MPI_ARCH_PATH/bin ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ setenv FOAM_MPI_LIBBIN $FOAM_LIB/lam ++# unset mpi_version + breaksw + + case MPICH: +- set mpi_version=mpich-1.2.4 +- setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version +- setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS ++# set mpi_version=mpich-1.2.4 ++# setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version ++# setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS ++ setenv MPI_ARCH_PATH /usr + setenv MPICH_ROOT $MPI_ARCH_PATH + +- _foamAddLib $MPI_ARCH_PATH/lib +- _foamAddPath $MPI_ARCH_PATH/bin ++# _foamAddLib $MPI_ARCH_PATH/lib ++# _foamAddPath $MPI_ARCH_PATH/bin + +- setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version +- unset mpi_version ++ setenv FOAM_MPI_LIBBIN $FOAM_LIB/mpich ++# unset mpi_version + breaksw + + case MPICH-GM: +--- OpenFOAM-1.5-src/wmake/rules/General/flex++ 2008-05-01 16:16:40.000000000 +0200 ++++ OpenFOAM-1.5/wmake/rules/General/flex++ 2008-07-22 16:18:41.000000000 +0200 +@@ -1,6 +1,6 @@ + .SUFFIXES: .L + +-Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ ++Ltoo = flex --c++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ + + .L.dep: + $(MAKE_DEP) +--- OpenFOAM-1.5-src/wmake/Makefile 2008-06-27 13:19:31.000000000 +0200 ++++ OpenFOAM-1.5/wmake/Makefile 2008-07-20 23:06:27.000000000 +0200 +@@ -56,7 +56,7 @@ + + LIB_SRC = $(WM_PROJECT_DIR)/src + LIB_DIR = $(WM_PROJECT_DIR)/lib +-LIB_WM_OPTIONS_DIR = $(LIB_DIR)/$(WM_OPTIONS) ++LIB_WM_OPTIONS_DIR = $(LIB_DIR) + OBJECTS_DIR = $(MAKE_DIR)/$(WM_OPTIONS) + CLASSES_DIR = $(MAKE_DIR)/classes + +--- OpenFOAM-1.5-src/bin/paraFoam 2008-07-03 18:14:43.000000000 +0200 ++++ OpenFOAM-1.5/bin/paraFoam 2008-07-22 15:23:24.000000000 +0200 +@@ -77,8 +77,8 @@ + [ -s "$parentDir/$check" ] || usage "file does not exist: '$parentDir/$check'" + done + +-#caseFile="$caseName.foam" +-caseFile="$caseName.OpenFOAM" ++caseFile="$caseName.foam" ++# caseFile="$caseName.OpenFOAM" + + case "$ParaView_VERSION" in + 2*) +@@ -96,7 +96,7 @@ + *) + # Clean up on termination and on Ctrl-C + trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT +- touch $caseFile ++ ln system/controlDict $caseFile + paraview --data=$caseFile + ;; + +--- OpenFOAM-1.5-src/src/decompositionAgglomeration/decompositionMethods/Make/options 2008-06-09 16:22:09.000000000 +0200 ++++ OpenFOAM-1.5/src/decompositionAgglomeration/decompositionMethods/Make/options 2008-07-20 22:19:30.000000000 +0200 +@@ -1,6 +1,5 @@ + EXE_INC = \ +- -I$(WM_THIRD_PARTY_DIR)/metis-5.0pre2/include ++ -I/usr/include/metis + + LIB_LIBS = \ +- -lmetis \ +- -lGKlib ++ -lmetis +--- OpenFOAM-1.5-src/src/decompositionAgglomeration/parMetisDecomp/Make/options 2008-06-09 16:23:55.000000000 +0200 ++++ OpenFOAM-1.5/src/decompositionAgglomeration/parMetisDecomp/Make/options 2008-07-20 22:24:04.000000000 +0200 +@@ -2,11 +2,11 @@ + + EXE_INC = \ + $(PFLAGS) $(PINC) \ +- -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1/ParMETISLib \ +- -I$(WM_THIRD_PARTY_DIR)/ParMetis-3.1 \ ++ -I/usr/include/parmetis \ ++ -I/usr/include/metis \ + -I../decompositionMethods/lnInclude + + LIB_LIBS = \ + -L$(FOAM_MPI_LIBBIN) \ +- -lmetis-parmetis \ ++ -lmetis \ + -lparmetis +--- OpenFOAM-1.5-src/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options 2008-06-09 16:22:37.000000000 +0200 ++++ OpenFOAM-1.5/src/decompositionAgglomeration/MGridGenGamgAgglomeration/Make/options 2008-07-21 20:45:42.000000000 +0200 +@@ -1,5 +1,3 @@ +-ParMGridGen = $(WM_THIRD_PARTY_DIR)/ParMGridGen-1.0 +- + TYPE_REAL= + #if defined(SP) + TYPE_REAL=-DTYPE_REAL +@@ -7,9 +5,9 @@ + + EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ +- -I$(ParMGridGen)/MGridGen/Lib/lnInclude \ +- -I$(ParMGridGen)/MGridGen/IMlib/lnInclude \ ++ -I/usr/include/mgridgen \ + $(TYPE_REAL) + + LIB_LIBS = \ ++ -lIMlib \ + -lMGridGen |