diff options
| author | Cyrus Harrison <cyrush@llnl.gov> | 2020-01-19 18:22:03 -0800 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2020-01-19 20:22:03 -0600 |
| commit | ca26eb69231fffb500459746a218b04724657652 (patch) | |
| tree | fc04c564227e5a1cae313ae8ce5679fcb0aa3f06 | |
| parent | dbb149cd7f5d5c88bfc9787f4c163337f928efc2 (diff) | |
| download | spack-ca26eb69231fffb500459746a218b04724657652.tar.gz spack-ca26eb69231fffb500459746a218b04724657652.tar.bz2 spack-ca26eb69231fffb500459746a218b04724657652.tar.xz spack-ca26eb69231fffb500459746a218b04724657652.zip | |
add conduit 0.5.1 release and allow conduit to build against statically linked python (#14559)
| -rw-r--r-- | var/spack/repos/builtin/packages/conduit/package.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 480f5dca1e..eecc15d798 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -38,6 +38,7 @@ class Conduit(Package): git = "https://github.com/LLNL/conduit.git" version('master', branch='master', submodules=True, preferred=True) + version('0.5.1', sha256='68a3696d1ec6d3a4402b44a464d723e6529ec41016f9b44c053676affe516d44') version('0.5.0', sha256='7efac668763d02bd0a2c0c1b134d9f5ee27e99008183905bb0512e5502b8b4fe') version('0.4.0', sha256='c228e6f0ce5a9c0ffb98e0b3d886f2758ace1a4b40d00f3f118542c0747c1f52') version('0.3.1', sha256='7b358ca03bb179876291d4a55d6a1c944b7407a80a588795b9e47940b1990521') @@ -89,9 +90,7 @@ class Conduit(Package): ####################### # Python ####################### - # we need a shared version of python b/c linking with static python lib - # causes duplicate state issues when running compiled python modules. - depends_on("python+shared", when="+python") + depends_on("python", when="+python") extends("python", when="+python") depends_on("py-numpy", when="+python", type=('build', 'run')) @@ -370,7 +369,7 @@ class Conduit(Package): cfg.write("# Python Support\n") - if "+python" in spec and "+shared" in spec: + if "+python" in spec: cfg.write("# Enable python module builds\n") cfg.write(cmake_cache_entry("ENABLE_PYTHON", "ON")) cfg.write("# python from spack \n") |