Skip to content

Commit

Permalink
Add libiconv dependency for git (#1468)
Browse files Browse the repository at this point in the history
Also remove "--without-pcre" flag that git does not understand any more.
  • Loading branch information
eschnett authored and tgamblin committed Sep 9, 2016
1 parent 8249108 commit 567d67f
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions var/spack/repos/builtin/packages/git/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit 567d67f

Please sign in to comment.