From f9cc073be0bf706adfb2a8ffd20f380bbfa7a1be Mon Sep 17 00:00:00 2001 From: Rémi Lacroix Date: Mon, 29 Mar 2021 17:47:02 +0200 Subject: ELPA: Add missing Python build dependency. (#22466) Also patch the "manual_cpp" Python script with proper shebang to ensure the Spack provided Python is used instead of the system Python. --- var/spack/repos/builtin/packages/elpa/package.py | 4 ++++ var/spack/repos/builtin/packages/elpa/python_shebang.patch | 8 ++++++++ 2 files changed, 12 insertions(+) create mode 100644 var/spack/repos/builtin/packages/elpa/python_shebang.patch diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py index e65904e871..6ab1dab6fa 100644 --- a/var/spack/repos/builtin/packages/elpa/package.py +++ b/var/spack/repos/builtin/packages/elpa/package.py @@ -35,6 +35,10 @@ class Elpa(AutotoolsPackage, CudaPackage): depends_on('lapack') depends_on('scalapack') depends_on('libtool', type='build') + depends_on('python@:2', type='build', when='@:2020.05.001') + depends_on('python@3:', type='build', when='@2020.11.001:') + + patch('python_shebang.patch', when='@:2020.05.001') def url_for_version(self, version): t = 'https://elpa.mpcdf.mpg.de/html/Releases/{0}/elpa-{0}.tar.gz' diff --git a/var/spack/repos/builtin/packages/elpa/python_shebang.patch b/var/spack/repos/builtin/packages/elpa/python_shebang.patch new file mode 100644 index 0000000000..4b9b2c9530 --- /dev/null +++ b/var/spack/repos/builtin/packages/elpa/python_shebang.patch @@ -0,0 +1,8 @@ +--- a/manual_cpp 2021-01-27 20:21:23.897206207 +0100 ++++ b/manual_cpp 2021-01-27 20:13:08.743822289 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python + from __future__ import print_function + import os + import sys -- cgit v1.2.3-70-g09d2