diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2016-09-09 15:57:49 -0400 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-09-09 12:57:49 -0700 |
| commit | 567d67fae2e2c014266c0df249ecd41d76b0cc6a (patch) | |
| tree | 4a9b4596038c763c96e2a20b1e9e32384e62b721 /var | |
| parent | 8249108cc6ef82b954ed5b5eabaff88be42ee2b8 (diff) | |
| download | spack-567d67fae2e2c014266c0df249ecd41d76b0cc6a.tar.gz spack-567d67fae2e2c014266c0df249ecd41d76b0cc6a.tar.bz2 spack-567d67fae2e2c014266c0df249ecd41d76b0cc6a.tar.xz spack-567d67fae2e2c014266c0df249ecd41d76b0cc6a.zip | |
Add libiconv dependency for git (#1468)
Also remove "--without-pcre" flag that git does not understand any more.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/git/package.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index ed058e0a68..a687b2bb35 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -54,25 +54,27 @@ class Git(Package): # version('2.5.4', '3eca2390cf1fa698b48e2a233563a76b') # version('2.2.1', 'ff41fdb094eed1ec430aed8ee9b9849c') - depends_on("openssl") depends_on("autoconf", type='build') depends_on("curl") depends_on("expat") depends_on("gettext") - depends_on("zlib") + depends_on("libiconv") + depends_on("openssl") depends_on("pcre") depends_on("perl") + depends_on("zlib") def install(self, spec, prefix): env['LDFLAGS'] = "-L%s" % spec['gettext'].prefix.lib + " -lintl" configure_args = [ "--prefix=%s" % prefix, - "--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-iconv=%s" % spec['libiconv'].prefix, + "--with-libpcre=%s" % spec['pcre'].prefix, + "--with-openssl=%s" % spec['openssl'].prefix, "--with-perl=%s" % join_path(spec['perl'].prefix.bin, 'perl'), + "--with-zlib=%s" % spec['zlib'].prefix, ] which('autoreconf')('-i') |