From 186730a2843da9730cc819b71a2668f9969e2176 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 6 Jan 2022 15:16:43 -0600 Subject: bazel: python executable required (#28286) * bazel: python executable required * python: add autodetection of +pythoncmd --- var/spack/repos/builtin/packages/bazel/package.py | 2 +- var/spack/repos/builtin/packages/python/package.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'var') 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: -- cgit v1.2.3-60-g2f50