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
This commit is contained in:
Michael Kuhn 2017-09-26 15:27:28 +02:00 committed by Christoph Junghans
parent f3152a5600
commit 60f8621704
4 changed files with 29 additions and 0 deletions

View file

@ -46,6 +46,7 @@ class Glib(AutotoolsPackage):
depends_on('libffi') depends_on('libffi')
depends_on('zlib') depends_on('zlib')
depends_on('gettext') depends_on('gettext')
depends_on('perl', type=('build', 'run'))
depends_on('pcre+utf', when='@2.48:') depends_on('pcre+utf', when='@2.48:')
depends_on('util-linux', when='+libmount') depends_on('util-linux', when='+libmount')
@ -70,3 +71,11 @@ def configure_args(self):
args.append('--disable-libmount') args.append('--disable-libmount')
return args 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)

View file

@ -43,3 +43,4 @@ class Libx11(AutotoolsPackage):
depends_on('inputproto', type='build') depends_on('inputproto', type='build')
depends_on('pkg-config@0.9.0:', type='build') depends_on('pkg-config@0.9.0:', type='build')
depends_on('util-macros', type='build') depends_on('util-macros', type='build')
depends_on('perl', type='build')

View file

@ -23,6 +23,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from spack import * from spack import *
import glob
class Likwid(Package): class Likwid(Package):
@ -47,8 +48,25 @@ class Likwid(Package):
# TODO: check # TODO: check
# depends_on('gnuplot', type='run') # depends_on('gnuplot', type='run')
depends_on('perl', type=('build', 'run'))
supported_compilers = {'clang': 'CLANG', 'gcc': 'GCC', 'intel': 'ICC'} 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): def install(self, spec, prefix):
if self.compiler.name not in self.supported_compilers: if self.compiler.name not in self.supported_compilers:
raise RuntimeError('{0} is not a supported compiler \ raise RuntimeError('{0} is not a supported compiler \

View file

@ -39,6 +39,7 @@ class SharedMimeInfo(AutotoolsPackage):
depends_on('glib') depends_on('glib')
depends_on('libxml2') depends_on('libxml2')
depends_on('intltool', type='build') depends_on('intltool', type='build')
depends_on('gettext', type='build')
depends_on('pkg-config@0.9.0:', type='build') depends_on('pkg-config@0.9.0:', type='build')
def setup_dependent_environment(self, spack_env, run_env, dependent_spec): def setup_dependent_environment(self, spack_env, run_env, dependent_spec):