Allow git to depend on gettext now that it works
This commit is contained in:
parent
4014a29d2b
commit
ab885a5397
@ -24,6 +24,7 @@
|
||||
##############################################################################
|
||||
from spack import *
|
||||
|
||||
|
||||
class Git(Package):
|
||||
"""Git is a free and open source distributed version control
|
||||
system designed to handle everything from small to very large
|
||||
@ -36,31 +37,27 @@ class Git(Package):
|
||||
version('2.7.3', 'fa1c008b56618c355a32ba4a678305f6')
|
||||
version('2.7.1', 'bf0706b433a8dedd27a63a72f9a66060')
|
||||
|
||||
|
||||
# See here for info on vulnerable Git versions:
|
||||
# http://www.theregister.co.uk/2016/03/16/git_server_client_patch_now/
|
||||
# All the following are vulnerable
|
||||
#version('2.6.3', 'b711be7628a4a2c25f38d859ee81b423')
|
||||
#version('2.6.2', 'da293290da69f45a86a311ad3cd43dc8')
|
||||
#version('2.6.1', '4c62ee9c5991fe93d99cf2a6b68397fd')
|
||||
#version('2.6.0', 'eb76a07148d94802a1745d759716a57e')
|
||||
#version('2.5.4', '3eca2390cf1fa698b48e2a233563a76b')
|
||||
#version('2.2.1', 'ff41fdb094eed1ec430aed8ee9b9849c')
|
||||
|
||||
# version('2.6.3', 'b711be7628a4a2c25f38d859ee81b423')
|
||||
# version('2.6.2', 'da293290da69f45a86a311ad3cd43dc8')
|
||||
# version('2.6.1', '4c62ee9c5991fe93d99cf2a6b68397fd')
|
||||
# version('2.6.0', 'eb76a07148d94802a1745d759716a57e')
|
||||
# version('2.5.4', '3eca2390cf1fa698b48e2a233563a76b')
|
||||
# version('2.2.1', 'ff41fdb094eed1ec430aed8ee9b9849c')
|
||||
|
||||
depends_on("openssl")
|
||||
depends_on("autoconf", type='build')
|
||||
depends_on("curl")
|
||||
depends_on("expat")
|
||||
|
||||
# Also depends_on gettext: apt-get install gettext (Ubuntu)
|
||||
depends_on("gettext")
|
||||
depends_on("zlib")
|
||||
|
||||
# Use system perl for now.
|
||||
# depends_on("perl")
|
||||
# depends_on("pcre")
|
||||
|
||||
depends_on("zlib")
|
||||
|
||||
def install(self, spec, prefix):
|
||||
configure_args = [
|
||||
"--prefix=%s" % prefix,
|
||||
@ -68,8 +65,8 @@ def install(self, spec, prefix):
|
||||
"--with-openssl=%s" % spec['openssl'].prefix,
|
||||
"--with-zlib=%s" % spec['zlib'].prefix,
|
||||
"--with-curl=%s" % spec['curl'].prefix,
|
||||
"--with-expat=%s" % spec['expat'].prefix,
|
||||
]
|
||||
"--with-expat=%s" % spec['expat'].prefix
|
||||
]
|
||||
|
||||
which('autoreconf')('-i')
|
||||
configure(*configure_args)
|
||||
|
Loading…
Reference in New Issue
Block a user