diff options
| author | TZ <tz-rrze@users.noreply.github.com> | 2018-08-27 02:44:06 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-08-26 19:44:06 -0500 |
| commit | 2ae1bfd2835b0227e5f85a1f44c0dce0a24ddb29 (patch) | |
| tree | 0d331127c5dc143726085a6b11cf53d8671638ab | |
| parent | cc01e89d6b0a615059fe3c8ac933230ed41930df (diff) | |
| download | spack-2ae1bfd2835b0227e5f85a1f44c0dce0a24ddb29.tar.gz spack-2ae1bfd2835b0227e5f85a1f44c0dce0a24ddb29.tar.bz2 spack-2ae1bfd2835b0227e5f85a1f44c0dce0a24ddb29.tar.xz spack-2ae1bfd2835b0227e5f85a1f44c0dce0a24ddb29.zip | |
patch for OF.com@18.06 to correctly find KAHIP (#8982)
- OpenFOAM-v1806/wmake/scripts/have_kahip must check
$KAHIP_ARCH_PATH instead of $METIS_ARCH_PATH to detect the KAHIB
library
- use a local patch file until the issue is hopefully fixed upstream
| -rw-r--r-- | var/spack/repos/builtin/packages/openfoam-com/1806-have-kahip.patch | 17 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/openfoam-com/package.py | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/openfoam-com/1806-have-kahip.patch b/var/spack/repos/builtin/packages/openfoam-com/1806-have-kahip.patch new file mode 100644 index 0000000000..3e10a44145 --- /dev/null +++ b/var/spack/repos/builtin/packages/openfoam-com/1806-have-kahip.patch @@ -0,0 +1,17 @@ +--- OpenFOAM-v1806/wmake/scripts/have_kahip-ORIG 2018-06-28 16:39:32.000000000 +0200 ++++ OpenFOAM-v1806/wmake/scripts/have_kahip 2018-08-11 13:37:18.250219013 +0200 +@@ -83,10 +83,10 @@ + # FOAM_EXT_LIBBIN is allowed to be unset + library=$(findFirstFile \ + $FOAM_EXT_LIBBIN/$library \ +- $METIS_ARCH_PATH/lib/$static \ +- $METIS_ARCH_PATH/lib/$library \ +- $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$static \ +- $METIS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$library \ ++ $KAHIP_ARCH_PATH/lib/$static \ ++ $KAHIP_ARCH_PATH/lib/$library \ ++ $KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$static \ ++ $KAHIP_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/$library \ + ) + elif isSystem "$KAHIP_ARCH_PATH" + then diff --git a/var/spack/repos/builtin/packages/openfoam-com/package.py b/var/spack/repos/builtin/packages/openfoam-com/package.py index 7613d688f7..27e9de86b5 100644 --- a/var/spack/repos/builtin/packages/openfoam-com/package.py +++ b/var/spack/repos/builtin/packages/openfoam-com/package.py @@ -355,6 +355,7 @@ class OpenfoamCom(Package): # Version-specific patches patch('1612-spack-patches.patch', when='@1612') + patch('1806-have-kahip.patch', when='@1806') # Some user config settings # default: 'compile-option': 'RpathOpt', |