diff options
| author | Michael Kuhn <suraia@ikkoku.de> | 2018-01-14 05:10:42 +0100 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-01-13 22:10:42 -0600 |
| commit | df7876ab54f58b4bbc7969ad00dd7a6a46813d7c (patch) | |
| tree | 5e6a380fefb98937bd6ea121445b34699628eda7 /var | |
| parent | 589ea856a58a67a90d57522f26f84e22b8dd85a6 (diff) | |
| download | spack-df7876ab54f58b4bbc7969ad00dd7a6a46813d7c.tar.gz spack-df7876ab54f58b4bbc7969ad00dd7a6a46813d7c.tar.bz2 spack-df7876ab54f58b4bbc7969ad00dd7a6a46813d7c.tar.xz spack-df7876ab54f58b4bbc7969ad00dd7a6a46813d7c.zip | |
Do not construct path to perl command manually (#6927)
Instead, use spec['perl'].command.path.
Diffstat (limited to 'var')
5 files changed, 8 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/autoconf/package.py b/var/spack/repos/builtin/packages/autoconf/package.py index f178a6e264..358131d91b 100644 --- a/var/spack/repos/builtin/packages/autoconf/package.py +++ b/var/spack/repos/builtin/packages/autoconf/package.py @@ -55,12 +55,11 @@ class Autoconf(AutotoolsPackage): # We have to do this after install because otherwise the install # target will try to rebuild the binaries (filter_file updates the # timestamps) - perl = join_path(self.spec['perl'].prefix.bin, 'perl') # Revert sbang, so Spack's sbang hook can fix it up filter_file('^#! /usr/bin/env perl', - '#! {0} -w'.format(perl), - '{0}/autom4te'.format(self.prefix.bin), + '#! {0} -w'.format(self.spec['perl'].command.path), + self.prefix.bin.autom4te, backup=False) def _make_executable(self, name): diff --git a/var/spack/repos/builtin/packages/canu/package.py b/var/spack/repos/builtin/packages/canu/package.py index 0198246e72..171dc49f97 100644 --- a/var/spack/repos/builtin/packages/canu/package.py +++ b/var/spack/repos/builtin/packages/canu/package.py @@ -42,9 +42,8 @@ class Canu(MakefilePackage): def patch(self): # Use our perl, not whatever is in the environment - perl = self.spec['perl'].prefix.bin.perl filter_file(r'^#!/usr/bin/env perl', - '#!{0}'.format(perl), + '#!{0}'.format(self.spec['perl'].command.path), 'src/pipelines/canu.pl') def install(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index f9510273d8..096f2772f3 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -64,10 +64,11 @@ class Likwid(Package): @run_before('install') def filter_sbang(self): # Filter sbang before install so Spack's sbang hook can fix it up - perl = join_path(self.spec['perl'].prefix.bin, 'perl') files = ['perl/feedGnuplot'] + glob.glob('filters/*') - filter_file('^#!/usr/bin/perl', '#!{0}'.format(perl), *files) + filter_file('^#!/usr/bin/perl', + '#!{0}'.format(self.spec['perl'].command.path), + *files) def install(self, spec, prefix): if self.compiler.name not in self.supported_compilers: diff --git a/var/spack/repos/builtin/packages/repeatmasker/package.py b/var/spack/repos/builtin/packages/repeatmasker/package.py index c9713c7892..a4c12ad22a 100644 --- a/var/spack/repos/builtin/packages/repeatmasker/package.py +++ b/var/spack/repos/builtin/packages/repeatmasker/package.py @@ -63,7 +63,7 @@ class Repeatmasker(Package): # Repeatmasker? (Y/N) # Add a Search Engine: Done - config_answers = ['\n', '%s\n' % self.spec['perl'].prefix.bin.perl, + config_answers = ['\n', '%s\n' % self.spec['perl'].command.path, '%s\n' % self.stage.source_path, '%s\n' % self.spec['trf'].prefix.bin.trf, '2\n', '%s\n' % self.spec['ncbi-rmblastn'].prefix.bin, diff --git a/var/spack/repos/builtin/packages/vcftools/package.py b/var/spack/repos/builtin/packages/vcftools/package.py index f62702a0eb..4813a804bb 100644 --- a/var/spack/repos/builtin/packages/vcftools/package.py +++ b/var/spack/repos/builtin/packages/vcftools/package.py @@ -55,8 +55,7 @@ class Vcftools(AutotoolsPackage): with working_dir('src/perl'): match = '^#!/usr/bin/env perl' - perl = join_path(self.spec['perl'].prefix.bin, 'perl') - substitute = "#!{perl}".format(perl=perl) + substitute = "#!{perl}".format(perl=self.spec['perl'].command.path) # tab-to-vcf added in 0.1.15 files = ['fill-aa', 'fill-an-ac', 'fill-fs', 'fill-ref-md5', 'tab-to-vcf', 'vcf-annotate', |