1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
Description: fixes FTBFS due to case-sensitive folder name.
This is a very bad bug due to a handmade build system.
Without this patch it is possible to build the package only
if the build directory calls OpenFOAM-4. With the standard
debian folder openfoam_4* the package FTBFS.
.
One need to control scotch-version, which can be updated
with the next openfoam-versions. This patch should be
then updated correspondingly.
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2016-10-09
Index: openfoam/bin/foamEtcFile
===================================================================
--- openfoam.orig/bin/foamEtcFile
+++ openfoam/bin/foamEtcFile
@@ -99,8 +99,8 @@ unset versionNum
# handle standard and debian naming convention
#
case "$projectDirName" in
-OpenFOAM-*) # standard naming convention OpenFOAM-<VERSION>
- version="${projectDirName##OpenFOAM-}"
+openfoam-[0-9]*) # standard naming convention OpenFOAM-<VERSION>
+ version="$WM_PROJECT_VERSION"
;;
openfoam[0-9]* | openfoamdev) # debian naming convention 'openfoam<VERSION>'
Index: openfoam/src/parallel/decompose/Allwmake
===================================================================
--- openfoam.orig/src/parallel/decompose/Allwmake
+++ openfoam/src/parallel/decompose/Allwmake
@@ -5,15 +5,8 @@ cd ${0%/*} || exit 1 # Run from this
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
-if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch`
-then
- . $settings
- echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
-else
- echo
- echo "Error: no config.sh/scotch settings"
- echo
-fi
+export SCOTCH_VERSION=scotch_6.0.3
+export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$SCOTCH_VERSION
#
|
