Add libiconv dependency for git (#1468)

Also remove "--without-pcre" flag that git does not understand any more.
This commit is contained in:
Erik Schnetter 2016-09-09 15:57:49 -04:00 committed by Todd Gamblin
parent 8249108cc6
commit 567d67fae2

View file

@ -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')