summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/git/package.py8
-rw-r--r--var/spack/repos/builtin/packages/pcre/package.py6
2 files changed, 13 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py
index 31c6f01e77..74dbead529 100644
--- a/var/spack/repos/builtin/packages/git/package.py
+++ b/var/spack/repos/builtin/packages/git/package.py
@@ -44,6 +44,11 @@ class Git(AutotoolsPackage):
releases = [
{
+ 'version': '2.14.1',
+ 'md5': 'e965a37b3d277f2e7e78f5b04de28e2a',
+ 'md5_manpages': 'da2e75ea3972b9e93fb47023e3bf1401',
+ },
+ {
'version': '2.13.0',
'md5': 'd0f14da0ef1d22f1ce7f7876fadcb39f',
'md5_manpages': 'fda8d6d5314eb5a47e315405830f9970',
@@ -145,7 +150,8 @@ class Git(AutotoolsPackage):
depends_on('gettext')
depends_on('libiconv')
depends_on('openssl')
- depends_on('pcre')
+ depends_on('pcre', when='@:2.13')
+ depends_on('pcre+jit', when='@2.14:')
depends_on('perl')
depends_on('zlib')
diff --git a/var/spack/repos/builtin/packages/pcre/package.py b/var/spack/repos/builtin/packages/pcre/package.py
index 4175ab3f8b..914439be65 100644
--- a/var/spack/repos/builtin/packages/pcre/package.py
+++ b/var/spack/repos/builtin/packages/pcre/package.py
@@ -39,6 +39,9 @@ class Pcre(AutotoolsPackage):
patch('intel.patch', when='@8.38')
+ variant('jit', default=False,
+ description='Enable JIT support.')
+
variant('utf', default=True,
description='Enable support for UTF-8/16/32, '
'incompatible with EBCDIC.')
@@ -46,6 +49,9 @@ class Pcre(AutotoolsPackage):
def configure_args(self):
args = []
+ if '+jit' in self.spec:
+ args.append('--enable-jit')
+
if '+utf' in self.spec:
args.append('--enable-utf')
args.append('--enable-unicode-properties')