summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbecker33 <becker33@llnl.gov>2016-08-08 09:44:50 -0700
committerGitHub <noreply@github.com>2016-08-08 09:44:50 -0700
commit3ea13256205524c0a40612b712536ebea626472c (patch)
treef1a963c0a4ce1f891e509edff1bb8ac246a24c5f
parentdd30066feb71eef44cd5720d0265ad7aa3c6dc2a (diff)
parent9ebbde0e0100b8a9c077d6cb1e67fe7a6b2ec2ec (diff)
downloadspack-3ea13256205524c0a40612b712536ebea626472c.tar.gz
spack-3ea13256205524c0a40612b712536ebea626472c.tar.bz2
spack-3ea13256205524c0a40612b712536ebea626472c.tar.xz
spack-3ea13256205524c0a40612b712536ebea626472c.zip
Merge pull request #1345 from hartzell/feature/add-perl-dependency-to-git
Add depends_on('perl'), depends_on('pcre') to git package
-rw-r--r--var/spack/repos/builtin/packages/git/package.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py
index 01364580a0..3cc879088d 100644
--- a/var/spack/repos/builtin/packages/git/package.py
+++ b/var/spack/repos/builtin/packages/git/package.py
@@ -53,19 +53,19 @@ class Git(Package):
depends_on("expat")
depends_on("gettext")
depends_on("zlib")
-
- # Use system perl for now.
- # depends_on("perl")
- # depends_on("pcre")
+ depends_on("pcre")
+ depends_on("perl")
def install(self, spec, prefix):
+ env['LDFLAGS'] = "-L%s" % spec['gettext'].prefix.lib + " -lintl"
configure_args = [
"--prefix=%s" % prefix,
- "--without-pcre",
+ "--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-expat=%s" % spec['expat'].prefix,
+ "--with-perl=%s" % join_path(spec['perl'].prefix.bin, 'perl'),
]
which('autoreconf')('-i')