hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix intltool_sbang issue #4191 (#4192)

Browse source 
* fix intltool_sbang issue #4191

* add per dep even if already depending on perl-xml-parser

* adding more comment, properly spaced
This commit is contained in:
Luigi Calori 2017-06-14 20:24:01 +02:00 committed by Adam J. Stewart
parent 1ec3c14d23
commit daa5cf7e73
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
bin/sbang
View file

@ -109,13 +109,20 @@ while read line && ((lines < 2)) ; do
fi fi
lines=$((lines+1)) lines=$((lines+1))
done < "$script" done < "$script"
# this is ineeded for scripts with sbang parameter
# like ones in intltool
# #!/<spack-long-path>/perl -w
# this is the interpreter line with all the parameters as a vector
interpreter_v=(${interpreter})
# this is the single interpreter path
interpreter_f="${interpreter_v[0]}"
# Invoke any interpreter found, or raise an error if none was found. # Invoke any interpreter found, or raise an error if none was found.
if [[ -n "$interpreter" ]]; then if [[ -n "$interpreter_f" ]]; then
if [[ "${interpreter##*/}" = "perl" ]]; then if [[ "${interpreter_f##*/}" = "perl" ]]; then
exec $interpreter -x "$@" exec $interpreter_v -x "$@"
else else
exec $interpreter "$@" exec $interpreter_v "$@"
fi fi
else else
echo "error: sbang found no interpreter in $script" echo "error: sbang found no interpreter in $script"

3
var/spack/repos/builtin/packages/intltool/package.py
View file

@ -36,7 +36,8 @@ class Intltool(AutotoolsPackage):
version('0.51.0', '12e517cac2b57a0121cda351570f1e63') version('0.51.0', '12e517cac2b57a0121cda351570f1e63')
# requires XML::Parser perl module # requires XML::Parser perl module
# depends_on('perl@5.8.1:', type='build') depends_on('perl-xml-parser', type=('build', 'run'))
depends_on('perl@5.8.1:', type=('build', 'run'))
def check(self): def check(self):
# `make check` passes but causes `make install` to fail # `make check` passes but causes `make install` to fail