diff options
| author | Valentin Volkl <valentin.volkl@cern.ch> | 2022-04-14 11:43:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-14 11:43:39 +0200 |
| commit | a482970a3595754b3b1bc34ed74d1373c84a15bb (patch) | |
| tree | 6ad6c067af411a4443cb0572b2fbbffa91a68497 | |
| parent | bbb3f724afc14aeaa00081bee98a99e8bb1f0dc3 (diff) | |
| download | spack-a482970a3595754b3b1bc34ed74d1373c84a15bb.tar.gz spack-a482970a3595754b3b1bc34ed74d1373c84a15bb.tar.bz2 spack-a482970a3595754b3b1bc34ed74d1373c84a15bb.tar.xz spack-a482970a3595754b3b1bc34ed74d1373c84a15bb.zip | |
sherpa: fix build of recola interface (#30000)
| -rw-r--r-- | var/spack/repos/builtin/packages/recola/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/sherpa/package.py | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/recola/package.py b/var/spack/repos/builtin/packages/recola/package.py index f5d461926c..9b4768e2c3 100644 --- a/var/spack/repos/builtin/packages/recola/package.py +++ b/var/spack/repos/builtin/packages/recola/package.py @@ -23,7 +23,10 @@ class Recola(CMakePackage): variant('python', default=True, description="Build py-recola python bindings.") + version('2.2.4', sha256='16bdefb633d51842b4d32c39a43118d7052302cd63be456a473557e9b7e0316e') version('2.2.3', sha256='db0f5e448ed603ac4073d4bbf36fd74f401a22876ad390c0d02c815a78106c5f') + version('1.4.3', url='https://recola.hepforge.org/downloads/?f=recola-1.4.3.tar.gz', + sha256='f6a7dce6e1f09821ba919524f786557984f216c001ab63e7793e8aa9a8560ceb') depends_on('collier') depends_on('recola-sm') diff --git a/var/spack/repos/builtin/packages/sherpa/package.py b/var/spack/repos/builtin/packages/sherpa/package.py index 5e12fb9e82..85c0d58568 100644 --- a/var/spack/repos/builtin/packages/sherpa/package.py +++ b/var/spack/repos/builtin/packages/sherpa/package.py @@ -85,7 +85,10 @@ class Sherpa(AutotoolsPackage): depends_on('rivet', when='+rivet') depends_on('fastjet', when='+fastjet') depends_on('openloops', when='+openloops') - depends_on('recola', when='+recola') + # sherpa builds with recola2 with the patch below, + # but the authors have validated only recola1 + # see https://gitlab.com/sherpa-team/sherpa/-/issues/356 + depends_on('recola@1', when='+recola') depends_on('root', when='+root') depends_on('lhapdf', when='+lhapdf') depends_on('gzip', when='+gzip') @@ -102,6 +105,12 @@ class Sherpa(AutotoolsPackage): '#ifdef ARCH_DARWIN\n#include <sys/sysctl.h>\n#endif', 'ATOOLS/Org/Run_Parameter.C') + if self.spec.satisfies('^recola@2:'): + filter_file(r'#include "recola.h"', + '#include "recola.hpp"', + 'AddOns/Recola/Recola_Interface.H', + string=True) + def configure_args(self): args = [] args.append('--enable-shared') |