diff options
author | Hadrien G <knights_of_ni@gmx.com> | 2019-02-22 02:04:03 +0100 |
---|---|---|
committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-02-21 19:04:03 -0600 |
commit | 510a28d1567785055372213de4acd9b4580b0e39 (patch) | |
tree | 690ca8d81e35244ec821d19bd3c6ab7767dde1c0 /var/spack/repos/builtin/packages/gaudi | |
parent | 3b10e450d25310ff5939f3aa75c1bad3fc96dd96 (diff) | |
download | spack-510a28d1567785055372213de4acd9b4580b0e39.tar.gz spack-510a28d1567785055372213de4acd9b4580b0e39.tar.bz2 spack-510a28d1567785055372213de4acd9b4580b0e39.tar.xz spack-510a28d1567785055372213de4acd9b4580b0e39.zip |
Gaudi package: new version + xenv bugfix (#10668)
Extract implicit xenv dependency into a new package and add it as an
explicit dependency. Update Gaudi to explicitly depend on older
versions of xenv rather than the latest develop because that
conflicts with Spack's compiler wrappers.
Diffstat (limited to 'var/spack/repos/builtin/packages/gaudi')
-rw-r--r-- | var/spack/repos/builtin/packages/gaudi/package.py | 4 | ||||
-rw-r--r-- | var/spack/repos/builtin/packages/gaudi/use-xenv-master.diff | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/var/spack/repos/builtin/packages/gaudi/package.py b/var/spack/repos/builtin/packages/gaudi/package.py index 0e1146342c..29b9e1710a 100644 --- a/var/spack/repos/builtin/packages/gaudi/package.py +++ b/var/spack/repos/builtin/packages/gaudi/package.py @@ -14,8 +14,7 @@ class Gaudi(CMakePackage): version('develop', branch='master') version('30.5', commit='2c70e73ee5b543b26197b90dd59ea4e4d359d230') - - patch('use-xenv-master.diff') + version('31.0', commit='aeb156f0c40571b5753a9e1dab31e331491b2f3e') variant('tests', default=False, description='Prepare to run the test suite') @@ -30,6 +29,7 @@ class Gaudi(CMakePackage): depends_on('intel-tbb') depends_on('libuuid') depends_on('python@:2.99.99') + depends_on('py-xenv@develop_2018-12-20:') depends_on('range-v3') depends_on('root +python +root7 +ssl +tbb +threads') depends_on('zlib') diff --git a/var/spack/repos/builtin/packages/gaudi/use-xenv-master.diff b/var/spack/repos/builtin/packages/gaudi/use-xenv-master.diff deleted file mode 100644 index fd19561860..0000000000 --- a/var/spack/repos/builtin/packages/gaudi/use-xenv-master.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/GaudiProjectConfig.cmake b/cmake/GaudiProjectConfig.cmake -index ab1a24e1d..dc938da79 100644 ---- a/cmake/GaudiProjectConfig.cmake -+++ b/cmake/GaudiProjectConfig.cmake -@@ -410,7 +410,7 @@ macro(gaudi_project project version) - # Avoid interference from user environment - unset(ENV{GIT_DIR}) - unset(ENV{GIT_WORK_TREE}) -- execute_process(COMMAND git clone -b 0.0.1 https://gitlab.cern.ch/gaudi/xenv.git ${CMAKE_BINARY_DIR}/contrib/xenv) -+ execute_process(COMMAND git clone https://gitlab.cern.ch/gaudi/xenv.git ${CMAKE_BINARY_DIR}/contrib/xenv) - endif() - # I'd like to generate the script with executable permission, but I only - # found this workaround: https://stackoverflow.com/a/45515418 |