From 464ce2795a6790f67ef65bb6f921855b43bd3305 Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 23 Oct 2019 16:30:46 +0200 Subject: glib: Use correct python command (#13392) python~pythoncmd does not provide a python symlink for python3, so make sure we pick the right command. --- var/spack/repos/builtin/packages/glib/package.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index f6265771d7..f883508449 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -100,7 +100,8 @@ class Glib(AutotoolsPackage): files = ['gobject/glib-genmarshal.in', 'gobject/glib-mkenums.in'] filter_file('^#!/usr/bin/env @PYTHON@', - '#!/usr/bin/env python', + '#!/usr/bin/env {0}'.format( + os.path.basename(self.spec['python'].command.path)), *files) @run_before('configure') @@ -119,7 +120,8 @@ class Glib(AutotoolsPackage): copy(dtrace, dtrace_copy) filter_file( '^#!/usr/bin/python', - '#!/usr/bin/env python', + '#!/usr/bin/env {0}'.format( + os.path.basename(self.spec['python'].command.path)), dtrace_copy ) @@ -135,7 +137,8 @@ class Glib(AutotoolsPackage): # this after install because otherwise the install target will try # to rebuild files as filter_file updates the timestamps) if self.spec.satisfies('@2.53.4:'): - pattern = '^#!/usr/bin/env python' + pattern = '^#!/usr/bin/env {0}'.format( + os.path.basename(self.spec['python'].command.path)) repl = '#!{0}'.format(self.spec['python'].command.path) files = ['glib-genmarshal', 'glib-mkenums'] else: -- cgit v1.2.3-60-g2f50