summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorGeorge Hartzell <hartzell@alerce.com>2016-07-22 19:46:36 -0400
committerGeorge Hartzell <hartzell@alerce.com>2016-08-06 16:28:47 -0400
commit653905e3a26ac5a0160982f03aac7fd6c3e8804f (patch)
tree564e55559f61b66ea4e05e798cd6343019b5e8ff /var
parentd3f115933e45b5fb0c60c067ee43e5ac27855da5 (diff)
downloadspack-653905e3a26ac5a0160982f03aac7fd6c3e8804f.tar.gz
spack-653905e3a26ac5a0160982f03aac7fd6c3e8804f.tar.bz2
spack-653905e3a26ac5a0160982f03aac7fd6c3e8804f.tar.xz
spack-653905e3a26ac5a0160982f03aac7fd6c3e8804f.zip
Add depends_on('perl') to git package
This commit changes the git package to depend_on('perl'). The system perl is not always sufficient to install git (e.g. a CentOS7 system with the development tools group installed has perl but not the ExtUtils::MakeMaker package that git needs) and one can't always update the system's perl. This PR depends_on PR #1339, which adds a perl package to spack.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/git/package.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py
index 01364580a0..0f2fbc73db 100644
--- a/var/spack/repos/builtin/packages/git/package.py
+++ b/var/spack/repos/builtin/packages/git/package.py
@@ -55,7 +55,7 @@ class Git(Package):
depends_on("zlib")
# Use system perl for now.
- # depends_on("perl")
+ depends_on("perl")
# depends_on("pcre")
def install(self, spec, prefix):
@@ -64,8 +64,8 @@ class Git(Package):
"--without-pcre",
"--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')