diff options
| author | Michael Kuhn <suraia@ikkoku.de> | 2017-09-26 15:27:28 +0200 |
|---|---|---|
| committer | Christoph Junghans <christoph.junghans@gmail.com> | 2017-09-26 07:27:28 -0600 |
| commit | 60f8621704acdfe127c2875f3f44c1518fd57b9b (patch) | |
| tree | fa96b2c783f5ecbaca729589cefa644ce659161a | |
| parent | f3152a560036ce78047eab9323f79155b84d98cd (diff) | |
| download | spack-60f8621704acdfe127c2875f3f44c1518fd57b9b.tar.gz spack-60f8621704acdfe127c2875f3f44c1518fd57b9b.tar.bz2 spack-60f8621704acdfe127c2875f3f44c1518fd57b9b.tar.xz spack-60f8621704acdfe127c2875f3f44c1518fd57b9b.zip | |
Missing perl dependencies (#5204)
* glib: Add missing perl dependency
* shared-mime-info: Add missing perl dependency
* libx11: Add missing perl dependency
* likwid: Add missing perl dependency
4 files changed, 29 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/glib/package.py b/var/spack/repos/builtin/packages/glib/package.py index 8b882f1310..f57eb05774 100644 --- a/var/spack/repos/builtin/packages/glib/package.py +++ b/var/spack/repos/builtin/packages/glib/package.py @@ -46,6 +46,7 @@ class Glib(AutotoolsPackage): depends_on('libffi') depends_on('zlib') depends_on('gettext') + depends_on('perl', type=('build', 'run')) depends_on('pcre+utf', when='@2.48:') depends_on('util-linux', when='+libmount') @@ -70,3 +71,11 @@ class Glib(AutotoolsPackage): args.append('--disable-libmount') return args + + @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 = ['gobject/glib-mkenums'] + + filter_file('^#! /usr/bin/perl', '#!{0}'.format(perl), *files) diff --git a/var/spack/repos/builtin/packages/libx11/package.py b/var/spack/repos/builtin/packages/libx11/package.py index 8510556717..bf741a331a 100644 --- a/var/spack/repos/builtin/packages/libx11/package.py +++ b/var/spack/repos/builtin/packages/libx11/package.py @@ -43,3 +43,4 @@ class Libx11(AutotoolsPackage): depends_on('inputproto', type='build') depends_on('pkg-config@0.9.0:', type='build') depends_on('util-macros', type='build') + depends_on('perl', type='build') diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index 843259e8da..436c4423bb 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -23,6 +23,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## from spack import * +import glob class Likwid(Package): @@ -47,8 +48,25 @@ class Likwid(Package): # TODO: check # depends_on('gnuplot', type='run') + depends_on('perl', type=('build', 'run')) + supported_compilers = {'clang': 'CLANG', 'gcc': 'GCC', 'intel': 'ICC'} + def patch(self): + files = glob.glob('perl/*.*') + glob.glob('bench/perl/*.*') + + # Allow the scripts to find Spack's perl + filter_file('^#!/usr/bin/perl -w', '#!/usr/bin/env perl', *files) + filter_file('^#!/usr/bin/perl', '#!/usr/bin/env perl', *files) + + @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) + def install(self, spec, prefix): if self.compiler.name not in self.supported_compilers: raise RuntimeError('{0} is not a supported compiler \ diff --git a/var/spack/repos/builtin/packages/shared-mime-info/package.py b/var/spack/repos/builtin/packages/shared-mime-info/package.py index 2f42ebcd0a..917c4d995c 100644 --- a/var/spack/repos/builtin/packages/shared-mime-info/package.py +++ b/var/spack/repos/builtin/packages/shared-mime-info/package.py @@ -39,6 +39,7 @@ class SharedMimeInfo(AutotoolsPackage): depends_on('glib') depends_on('libxml2') depends_on('intltool', type='build') + depends_on('gettext', type='build') depends_on('pkg-config@0.9.0:', type='build') def setup_dependent_environment(self, spack_env, run_env, dependent_spec): |