Pileus Git - ~andy/sunrise/blob - sci-libs/openfoam-bin/files/compile-1.4.1.patch

   1 diff -ur OpenFOAM-1.4.1-src/src/Allwmake OpenFOAM-1.4.1/src/Allwmake
   2 --- OpenFOAM-1.4.1-src/src/Allwmake     2007-07-27 17:54:28.000000000 +0200
   3 +++ OpenFOAM-1.4.1/src/Allwmake 2007-10-18 21:04:12.000000000 +0200
   4 @@ -3,103 +3,103 @@
   5
   6  (cd $FOAM_SRC/OpenFOAM ; wmakeLnInclude . )
   7
   8 -wmake libso zlib-1.2.1
   9 -
  10 -if [ "$WM_MPLIB" = "OPENMPI" -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.a -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.so ]
  11 -then
  12 -
  13 -    cd $OPENMPI_HOME
  14 -
  15 -        gmake distclean
  16 -        rm -rf $OPENMPI_ARCH_PATH
  17 -
  18 -        ./configure \
  19 -            --prefix=$OPENMPI_ARCH_PATH \
  20 -            --disable-mpirun-prefix-by-default \
  21 -            --disable-orterun-prefix-by-default \
  22 -            --enable-shared --disable-static \
  23 -            --disable-mpi-f77 --disable-mpi-f90 --disable-mpi-cxx \
  24 -            --disable-mpi-profile
  25 -
  26 -        gmake
  27 -        gmake install
  28 -        gmake distclean
  29 -
  30 -    cd $FOAM_SRC
  31 -fi
  32 -
  33 -if [ "$WM_MPLIB" = "LAM" -a ! -r $LAM_ARCH_PATH/lib/libmpi.a -a ! -r $LAM_ARCH_PATH/lib/libmpi.so ]
  34 -then
  35 -
  36 -    cd $LAMHOME
  37 -
  38 -        gmake distclean
  39 -        rm -rf $LAM_ARCH_PATH
  40 -
  41 -        ./configure \
  42 -            --prefix=$LAM_ARCH_PATH \
  43 -            --enable-shared \
  44 -            --disable-static \
  45 -            --without-romio \
  46 -            --without-mpi2cpp \
  47 -            --without-profiling \
  48 -            --without-fc
  49 -
  50 -        gmake
  51 -        gmake install
  52 -        gmake distclean
  53 -
  54 -    cd $FOAM_SRC
  55 -fi
  56 -
  57 -if [ "$WM_MPLIB" = "MPICH" -a ! -r $MPICH_ARCH_PATH/lib/libmpich.a -a ! -r $MPICH_ARCH_PATH/lib/libmpich.so ]
  58 -then
  59 -
  60 -    cd $MPICH_PATH
  61 -
  62 -        make distclean
  63 -        rm -rf $MPICH_ARCH_PATH
  64 -        rm util/machines/machines.*
  65 -
  66 -        ./configure \
  67 -            --without-mpe \
  68 -            --disable-f77 \
  69 -            --disable-f90 \
  70 -            --disable-f90modules \
  71 -            --disable-c++ \
  72 -            --disable-mpedbg \
  73 -            --disable-devdebug \
  74 -            --disable-debug \
  75 -            --enable-sharedlib=$MPICH_ARCH_PATH/lib \
  76 -            --with-device=ch_p4 \
  77 -            -prefix=$MPICH_ARCH_PATH
  78 -        make
  79 -        make install
  80 -        make distclean
  81 -
  82 -        if [ -r $MPICH_ARCH_PATH ]
  83 -        then
  84 -            cd $MPICH_ARCH_PATH/bin
  85 -            for file in *
  86 -            do
  87 -                sed s%$MPICH_ARCH_PATH%'$MPICH_ARCH_PATH'%g $file > temp.$$
  88 -                mv temp.$$ $file
  89 -                chmod ugo+rx $file
  90 -            done
  91 -
  92 -            cd $MPICH_ARCH_PATH/lib
  93 -
  94 -            if [ -r libmpich.so.1.0 ]
  95 -            then
  96 -                rm *.so
  97 -                ln -s libmpich.so.1.0 libmpich.so
  98 -            fi
  99 -
 100 -            cd $MPICH_ARCH_PATH
 101 -        fi
 102 -
 103 -    cd $FOAM_SRC
 104 -fi
 105 +# wmake libso zlib-1.2.1
 106 +#
 107 +# if [ "$WM_MPLIB" = "OPENMPI" -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.a -a ! -r $OPENMPI_ARCH_PATH/lib/libmpi.so ]
 108 +# then
 109 +#
 110 +#     cd $OPENMPI_HOME
 111 +#
 112 +#         gmake distclean
 113 +#         rm -rf $OPENMPI_ARCH_PATH
 114 +#
 115 +#         ./configure \
 116 +#             --prefix=$OPENMPI_ARCH_PATH \
 117 +#             --disable-mpirun-prefix-by-default \
 118 +#             --disable-orterun-prefix-by-default \
 119 +#             --enable-shared --disable-static \
 120 +#             --disable-mpi-f77 --disable-mpi-f90 --disable-mpi-cxx \
 121 +#             --disable-mpi-profile
 122 +#
 123 +#         gmake
 124 +#         gmake install
 125 +#         gmake distclean
 126 +#
 127 +#     cd $FOAM_SRC
 128 +# fi
 129 +#
 130 +# if [ "$WM_MPLIB" = "LAM" -a ! -r $LAM_ARCH_PATH/lib/libmpi.a -a ! -r $LAM_ARCH_PATH/lib/libmpi.so ]
 131 +# then
 132 +#
 133 +#     cd $LAMHOME
 134 +#
 135 +#         gmake distclean
 136 +#         rm -rf $LAM_ARCH_PATH
 137 +#
 138 +#         ./configure \
 139 +#             --prefix=$LAM_ARCH_PATH \
 140 +#             --enable-shared \
 141 +#             --disable-static \
 142 +#             --without-romio \
 143 +#             --without-mpi2cpp \
 144 +#             --without-profiling \
 145 +#             --without-fc
 146 +#
 147 +#         gmake
 148 +#         gmake install
 149 +#         gmake distclean
 150 +#
 151 +#     cd $FOAM_SRC
 152 +# fi
 153 +#
 154 +# if [ "$WM_MPLIB" = "MPICH" -a ! -r $MPICH_ARCH_PATH/lib/libmpich.a -a ! -r $MPICH_ARCH_PATH/lib/libmpich.so ]
 155 +# then
 156 +#
 157 +#     cd $MPICH_PATH
 158 +#
 159 +#         make distclean
 160 +#         rm -rf $MPICH_ARCH_PATH
 161 +#         rm util/machines/machines.*
 162 +#
 163 +#         ./configure \
 164 +#             --without-mpe \
 165 +#             --disable-f77 \
 166 +#             --disable-f90 \
 167 +#             --disable-f90modules \
 168 +#             --disable-c++ \
 169 +#             --disable-mpedbg \
 170 +#             --disable-devdebug \
 171 +#             --disable-debug \
 172 +#             --enable-sharedlib=$MPICH_ARCH_PATH/lib \
 173 +#             --with-device=ch_p4 \
 174 +#             -prefix=$MPICH_ARCH_PATH
 175 +#         make
 176 +#         make install
 177 +#         make distclean
 178 +#
 179 +#         if [ -r $MPICH_ARCH_PATH ]
 180 +#         then
 181 +#             cd $MPICH_ARCH_PATH/bin
 182 +#             for file in *
 183 +#             do
 184 +#                 sed s%$MPICH_ARCH_PATH%'$MPICH_ARCH_PATH'%g $file > temp.$$
 185 +#                 mv temp.$$ $file
 186 +#                 chmod ugo+rx $file
 187 +#             done
 188 +#
 189 +#             cd $MPICH_ARCH_PATH/lib
 190 +#
 191 +#             if [ -r libmpich.so.1.0 ]
 192 +#             then
 193 +#                 rm *.so
 194 +#                 ln -s libmpich.so.1.0 libmpich.so
 195 +#             fi
 196 +#
 197 +#             cd $MPICH_ARCH_PATH
 198 +#         fi
 199 +#
 200 +#     cd $FOAM_SRC
 201 +# fi
 202
 203  (cd Pstream ; ./Allwmake)
 204  wmake libso OpenFOAM
 205 diff -ur OpenFOAM-1.4.1-src/wmake/rules/General/flex++ OpenFOAM-1.4.1/wmake/rules/General/flex++
 206 --- OpenFOAM-1.4.1-src/wmake/rules/General/flex++       2006-08-18 17:35:12.000000000 +0200
 207 +++ OpenFOAM-1.4.1/wmake/rules/General/flex++   2007-10-28 17:38:46.000000000 +0100
 208 @@ -1,6 +1,6 @@
 209  .SUFFIXES: .L
 210
 211 -Ltoo = flex++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
 212 +Ltoo = flex --c++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
 213
 214  .L.dep:
 215         $(MAKE_DEP)
 216 diff -ur OpenFOAM-1.4.1-src/wmake/rules/General/flex++.test OpenFOAM-1.4.1/wmake/rules/General/flex++.test
 217 --- OpenFOAM-1.4.1-src/wmake/rules/General/flex++.test  2007-03-13 17:27:58.000000000 +0100
 218 +++ OpenFOAM-1.4.1/wmake/rules/General/flex++.test      2007-10-28 17:39:09.000000000 +0100
 219 @@ -1,6 +1,6 @@
 220  .SUFFIXES: .L
 221
 222 -Ltoo = flex++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
 223 +Ltoo = flex --c++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
 224
 225  .L.dep:
 226         $(MAKE_DEP)
 227 diff -ur OpenFOAM-1.4.1-src/src/Allwmake OpenFOAM-1.4.1/src/Allwmake
 228 --- OpenFOAM-1.4.1-src/src/Allwmake     2007-07-27 17:54:28.000000000 +0200
 229 +++ OpenFOAM-1.4.1/src/Allwmake 2007-10-18 21:04:12.000000000 +0200
 230 @@ -141,13 +141,13 @@
 231
 232  (cd malloc ; ./Allwmake)
 233
 234 -if [ ! -r $MICO_ARCH_PATH/lib/libmico${MICO_VERSION}.a ]
 235 -then
 236 -    cd $MICO_PATH
 237 -    gmake distclean
 238 -    ./configure --prefix=$MICO_ARCH_PATH --disable-shared --without-x
 239 -    gmake
 240 -    gmake install
 241 -    gmake distclean
 242 -    cd ..
 243 -fi
 244 +# if [ ! -r $MICO_ARCH_PATH/lib/libmico${MICO_VERSION}.a ]
 245 +# then
 246 +#     cd $MICO_PATH
 247 +#     gmake distclean
 248 +#     ./configure --prefix=$MICO_ARCH_PATH --disable-shared --without-x
 249 +#     gmake
 250 +#     gmake install
 251 +#     gmake distclean
 252 +#     cd ..
 253 +# fi