zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow git to depend on gettext now that it works

Browse Source
This commit is contained in:
Adam J. Stewart 2016-07-26 09:47:45 -05:00
parent 4014a29d2b
commit ab885a5397
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
var/spack/repos/builtin/packages/git/package.py
View File

@ -24,6 +24,7 @@
############################################################################## ##############################################################################
from spack import * from spack import *
class Git(Package): class Git(Package):
"""Git is a free and open source distributed version control """Git is a free and open source distributed version control
system designed to handle everything from small to very large system designed to handle everything from small to very large
@ -36,7 +37,6 @@ class Git(Package):
version('2.7.3', 'fa1c008b56618c355a32ba4a678305f6') version('2.7.3', 'fa1c008b56618c355a32ba4a678305f6')
version('2.7.1', 'bf0706b433a8dedd27a63a72f9a66060') version('2.7.1', 'bf0706b433a8dedd27a63a72f9a66060')
# See here for info on vulnerable Git versions: # See here for info on vulnerable Git versions:
# http://www.theregister.co.uk/2016/03/16/git_server_client_patch_now/ # http://www.theregister.co.uk/2016/03/16/git_server_client_patch_now/
# All the following are vulnerable # All the following are vulnerable
@ -47,20 +47,17 @@ class Git(Package):
# version('2.5.4', '3eca2390cf1fa698b48e2a233563a76b') # version('2.5.4', '3eca2390cf1fa698b48e2a233563a76b')
# version('2.2.1', 'ff41fdb094eed1ec430aed8ee9b9849c') # version('2.2.1', 'ff41fdb094eed1ec430aed8ee9b9849c')
depends_on("openssl") depends_on("openssl")
depends_on("autoconf", type='build') depends_on("autoconf", type='build')
depends_on("curl") depends_on("curl")
depends_on("expat") depends_on("expat")
depends_on("gettext")
# Also depends_on gettext: apt-get install gettext (Ubuntu) depends_on("zlib")
# Use system perl for now. # Use system perl for now.
# depends_on("perl") # depends_on("perl")
# depends_on("pcre") # depends_on("pcre")
depends_on("zlib")
def install(self, spec, prefix): def install(self, spec, prefix):
configure_args = [ configure_args = [
"--prefix=%s" % prefix, "--prefix=%s" % prefix,
@ -68,7 +65,7 @@ def install(self, spec, prefix):
"--with-openssl=%s" % spec['openssl'].prefix, "--with-openssl=%s" % spec['openssl'].prefix,
"--with-zlib=%s" % spec['zlib'].prefix, "--with-zlib=%s" % spec['zlib'].prefix,
"--with-curl=%s" % spec['curl'].prefix, "--with-curl=%s" % spec['curl'].prefix,
"--with-expat=%s" % spec['expat'].prefix, "--with-expat=%s" % spec['expat'].prefix
] ]
which('autoreconf')('-i') which('autoreconf')('-i')