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

git + luafilesystem: minor fixes (#5635)

Browse source 
* git: setup_dependent_environment won't fail for external packages

* luafilesystem: relax the request on git (it seemed overly restrictive)
This commit is contained in:
Massimiliano Culpo 2017-10-06 21:56:14 +02:00 committed by Christoph Junghans
parent 68011bde39
commit 2b2a5ca7bf
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
var/spack/repos/builtin/packages/git/package.py
View file

@ -161,8 +161,12 @@ class Git(AutotoolsPackage):
depends_on('m4', type='build') depends_on('m4', type='build')
def setup_environment(self, spack_env, run_env): def setup_environment(self, spack_env, run_env):
spack_env.append_flags('LDFLAGS', '-L{0} -lintl'.format( # This is done to avoid failures when git is an external package.
self.spec['gettext'].prefix.lib)) # In that case the node in the DAG gets truncated and git DOES NOT
# have a gettext dependency.
if 'gettext' in self.spec:
spack_env.append_flags('LDFLAGS', '-L{0} -lintl'.format(
self.spec['gettext'].prefix.lib))
def configure_args(self): def configure_args(self):
spec = self.spec spec = self.spec

7
var/spack/repos/builtin/packages/lua-luafilesystem/package.py
View file

@ -40,7 +40,12 @@ class LuaLuafilesystem(Package):
version('1_6_3', 'bed11874cfded8b4beed7dd054127b24') version('1_6_3', 'bed11874cfded8b4beed7dd054127b24')
depends_on('git@2.9.3:', type='build') # The version constraint here comes from this post:
#
# https://www.perforce.com/blog/git-beyond-basics-using-shallow-clones
#
# where it is claimed that full shallow clone support was added @1.9
depends_on('git@1.9.0:', type='build')
extends('lua') extends('lua')
def install(self, spec, prefix): def install(self, spec, prefix):