diff options
| author | George Hartzell <hartzell@alerce.com> | 2016-08-03 20:28:54 -0400 |
|---|---|---|
| committer | George Hartzell <hartzell@alerce.com> | 2016-08-06 16:28:47 -0400 |
| commit | 1de5817b58553461bfb1ffe39146a31f588a6df8 (patch) | |
| tree | dbabd2355a212a1b5f4a3d97ef7cec7920811cce /var | |
| parent | f699d7c08e1454aa1e1e1bc29c3de583be4897dc (diff) | |
| download | spack-1de5817b58553461bfb1ffe39146a31f588a6df8.tar.gz spack-1de5817b58553461bfb1ffe39146a31f588a6df8.tar.bz2 spack-1de5817b58553461bfb1ffe39146a31f588a6df8.tar.xz spack-1de5817b58553461bfb1ffe39146a31f588a6df8.zip | |
Clean up rebase problems
My rebase duplicated the depends_on('zlib') and dropped the --with-curl
from the configure.
This fixes those.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/git/package.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index 5c559eb19c..e975da5e79 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -55,7 +55,6 @@ class Git(Package): depends_on("zlib") depends_on("pcre") depends_on("perl") - depends_on("zlib") def install(self, spec, prefix): configure_args = [ @@ -63,6 +62,7 @@ class Git(Package): "--with-libpcre=%s" % spec['pcre'].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-perl=%s" % join_path(spec['perl'].prefix.bin, 'perl'), ] |