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

Clean up rebase problems

Browse Source 
My rebase duplicated the depends_on('zlib') and dropped the --with-curl
from the configure.

This fixes those.
This commit is contained in:
George Hartzell
2016-08-03 20:28:54 -04:00
parent f699d7c08e
commit 1de5817b58
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,6 @@ class Git(Package):
depends_on("zlib") depends_on("zlib")
depends_on("pcre") depends_on("pcre")
depends_on("perl") depends_on("perl")
depends_on("zlib")
def install(self, spec, prefix): def install(self, spec, prefix):
configure_args = [ configure_args = [
@@ -63,6 +62,7 @@ def install(self, spec, prefix):
"--with-libpcre=%s" % spec['pcre'].prefix, "--with-libpcre=%s" % spec['pcre'].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-expat=%s" % spec['expat'].prefix, "--with-expat=%s" % spec['expat'].prefix,
"--with-perl=%s" % join_path(spec['perl'].prefix.bin, 'perl'), "--with-perl=%s" % join_path(spec['perl'].prefix.bin, 'perl'),
] ]