[openfoam] 01/03: Fix FTBFS due to case-sensitive folder name.
Anton Gladky
gladk at moszumanska.debian.org
Mon Oct 10 15:17:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository openfoam.
commit 1ce76c1c2a7ad3b506499467973a77645974adf4
Author: Anton Gladky <gladk at debian.org>
Date: Mon Oct 10 17:12:44 2016 +0200
Fix FTBFS due to case-sensitive folder name.
---
debian/patches/50_fix_folder_name_FTBFS.patch | 41 +++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 42 insertions(+)
diff --git a/debian/patches/50_fix_folder_name_FTBFS.patch b/debian/patches/50_fix_folder_name_FTBFS.patch
new file mode 100644
index 0000000..e8ab71e
--- /dev/null
+++ b/debian/patches/50_fix_folder_name_FTBFS.patch
@@ -0,0 +1,41 @@
+Description: fixes FTBFS due to case-sensitive folder name.
+Author: Anton Gladky <gladk at 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
+
+
+ #
diff --git a/debian/patches/series b/debian/patches/series
index aecbab2..8b3b91a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
20_yyflex-fix.patch
30_hardening.patch
40_build-parallel.patch
+50_fix_folder_name_FTBFS.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openfoam.git
More information about the debian-science-commits
mailing list