diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2022-01-06 15:16:43 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-06 15:16:43 -0600 |
| commit | 186730a2843da9730cc819b71a2668f9969e2176 (patch) | |
| tree | ab1ade446f1f8f3517cac578d17ba839c6c4dae8 /var | |
| parent | 6e31094d77f479e9f669d5f707a982116e09306f (diff) | |
| download | spack-186730a2843da9730cc819b71a2668f9969e2176.tar.gz spack-186730a2843da9730cc819b71a2668f9969e2176.tar.bz2 spack-186730a2843da9730cc819b71a2668f9969e2176.tar.xz spack-186730a2843da9730cc819b71a2668f9969e2176.zip | |
bazel: python executable required (#28286)
* bazel: python executable required
* python: add autodetection of +pythoncmd
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/bazel/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/python/package.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/bazel/package.py b/var/spack/repos/builtin/packages/bazel/package.py index e4cb1bd432..993b4aa82a 100644 --- a/var/spack/repos/builtin/packages/bazel/package.py +++ b/var/spack/repos/builtin/packages/bazel/package.py @@ -110,7 +110,7 @@ class Bazel(Package): variant('nodepfail', default=True, description='Disable failing dependency checks due to injected absolute paths - required for most builds using bazel with spack') depends_on('java', type=('build', 'run')) - depends_on('python', type=('build', 'run')) + depends_on('python+pythoncmd', type=('build', 'run')) depends_on('zip', when='platform=linux', type=('build', 'run')) # make work on power9 (2x commits) diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 141d5c703a..ad23c98168 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -271,6 +271,13 @@ class Python(AutotoolsPackage): python = Executable(exes[0]) variants = '' + for exe in exes: + if os.path.basename(exe) == 'python': + variants += '+pythoncmd' + break + else: + variants += '~pythoncmd' + for module in ['readline', 'sqlite3', 'dbm', 'nis', 'zlib', 'bz2', 'lzma', 'ctypes', 'uuid']: try: |