summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthelfer <thomas.helfer@cea.fr>2020-12-16 10:40:34 +0100
committerGitHub <noreply@github.com>2020-12-16 10:40:34 +0100
commitc52d9dc445ef150136427ca0e88c4cf327324be7 (patch)
tree697cbc519e9d729bbf5b494cc6edf7c2e8dacfec
parent352dc0624cea9ad013e2e403bd8d78f869cf79f4 (diff)
downloadspack-c52d9dc445ef150136427ca0e88c4cf327324be7.tar.gz
spack-c52d9dc445ef150136427ca0e88c4cf327324be7.tar.bz2
spack-c52d9dc445ef150136427ca0e88c4cf327324be7.tar.xz
spack-c52d9dc445ef150136427ca0e88c4cf327324be7.zip
Added TFEL v3.4 and MGIS v1.2 (#20234)
-rw-r--r--var/spack/repos/builtin/packages/mgis/package.py8
-rw-r--r--var/spack/repos/builtin/packages/tfel/package.py8
2 files changed, 13 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/mgis/package.py b/var/spack/repos/builtin/packages/mgis/package.py
index c03680a7d6..54f1f4210e 100644
--- a/var/spack/repos/builtin/packages/mgis/package.py
+++ b/var/spack/repos/builtin/packages/mgis/package.py
@@ -18,16 +18,18 @@ class Mgis(CMakePackage):
"""
homepage = "https://thelfer.github.io/mgis/web/index.html"
- url = "https://github.com/thelfer/MFrontGenericInterfaceSupport/archive/MFrontGenericInterfaceSupport-1.1.tar.gz"
+ url = "https://github.com/thelfer/MFrontGenericInterfaceSupport/archive/MFrontGenericInterfaceSupport-1.2.tar.gz"
git = "https://github.com/thelfer/MFrontGenericInterfaceSupport.git"
maintainers = ['thelfer']
# development branches
version("master", branch="master")
+ version("rliv-1.2", branch="rliv-1.2")
version("rliv-1.1", branch="rliv-1.1")
version("rliv-1.0", branch="rliv-1.0")
# released version
+ version('1.2', sha256='ed82ab91cbe17c00ef36578dbfcb4d1817d4c956619b7cccbea3e3f1a3b31940')
version('1.1', sha256='06593d7a052678deaee87ef60b2213db7545c5be9823f261d3388b3978a0b7a5')
version('1.0.1', sha256='6102621455bc5d9b1591cd33e93b2e15a9572d2ce59ca6dfa30ba57ae1265c08')
version('1.0', sha256='279c98da00fa6855edf29c2b8f8bad6e7732298dc62ef67d028d6bbeaac043b3')
@@ -44,9 +46,11 @@ class Mgis(CMakePackage):
values=('Debug', 'Release'))
# dependencies
+ depends_on('tfel@3.4.0', when="@1.2")
depends_on('tfel@3.3.0', when="@1.1")
depends_on('tfel@3.2.1', when="@1.0.1")
depends_on('tfel@3.2.0', when="@1.0")
+ depends_on('tfel@rliv-3.4', when="@rliv-1.2")
depends_on('tfel@rliv-3.3', when="@rliv-1.1")
depends_on('tfel@rliv-3.2', when="@rliv-1.0")
depends_on('tfel@master', when="@master")
@@ -57,6 +61,8 @@ class Mgis(CMakePackage):
args = []
+ args.append("-DUSE_EXTERNAL_COMPILER_FLAGS=ON")
+
for i in ['c', 'fortran', 'python']:
if '+' + i in self.spec:
args.append("-Denable-{0}-bindings=ON".format(i))
diff --git a/var/spack/repos/builtin/packages/tfel/package.py b/var/spack/repos/builtin/packages/tfel/package.py
index 86305d69f8..6b4ce4832b 100644
--- a/var/spack/repos/builtin/packages/tfel/package.py
+++ b/var/spack/repos/builtin/packages/tfel/package.py
@@ -29,12 +29,13 @@ class Tfel(CMakePackage):
"""
homepage = "http://tfel.sourceforge.net"
- url = "https://github.com/thelfer/tfel/archive/TFEL-3.3.0.tar.gz"
+ url = "https://github.com/thelfer/tfel/archive/TFEL-3.4.0.tar.gz"
git = "https://github.com/thelfer/tfel.git"
maintainers = ['thelfer']
# development branches
version("master", branch="master")
+ version("rliv-3.4", branch="rliv-3.4")
version("rliv-3.3", branch="rliv-3.3")
version("rliv-3.2", branch="rliv-3.2")
version("rliv-3.1", branch="rliv-3.1")
@@ -43,6 +44,7 @@ class Tfel(CMakePackage):
version("rliv-1.2", branch="rliv-1.2")
# released version
+ version('3.4.0', sha256='884ad68b0fbbededc3a602d559433c24114ae4534dc9f0a759d31ca3589dace0')
version('3.3.0', sha256='884ad68b0fbbededc3a602d559433c24114ae4534dc9f0a759d31ca3589dace0')
version('3.2.2', sha256='69b01ae0d1f9140b619aaa9135948284ff40d4654672c335e55ab4934c02eb43')
version('3.2.1', sha256='12786480524a7fe86889120fb334fa00211dfd44ad5ec71e2279e7adf1ddc807')
@@ -101,7 +103,7 @@ class Tfel(CMakePackage):
type=('build', 'link', 'run'))
depends_on('python', when='+python_bindings',
type=('build', 'link', 'run'))
- depends_on('boost+python', when='+python_bindings')
+ depends_on('boost+python+numpy', when='+python_bindings')
extends('python', when='+python_bindings')
@@ -109,6 +111,8 @@ class Tfel(CMakePackage):
args = []
+ args.append("-DUSE_EXTERNAL_COMPILER_FLAGS=ON")
+
for i in ['fortran', 'java', 'aster', 'abaqus', 'calculix',
'ansys', 'europlexus', 'cyrano', 'lsdyna', 'python',
'comsol', 'diana-fea']: