From 9d7e482497e3ee3b4aeb6c495a27cd88d8b2a64c Mon Sep 17 00:00:00 2001 From: Andrew W Elble Date: Tue, 28 Jan 2020 22:01:25 -0500 Subject: git: add version 2.25.0 and fixup pcre dependency (#14649) * git: add version 2.25.0 and fixup pcre dependency pcre2 became optional in 2.14 and the default in 2.18. I noticed this as git was compiling against the system pcre2 (spack was specifying pcre as the dependency). * missed a chunk from my internal repo --- var/spack/repos/builtin/packages/git/package.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/git/package.py b/var/spack/repos/builtin/packages/git/package.py index a7f97a4601..c77c1fa916 100644 --- a/var/spack/repos/builtin/packages/git/package.py +++ b/var/spack/repos/builtin/packages/git/package.py @@ -24,6 +24,11 @@ class Git(AutotoolsPackage): # You can find the source here: https://mirrors.edge.kernel.org/pub/software/scm/git/sha256sums.asc releases = [ + { + 'version': '2.25.0', + 'sha256': 'a98c9b96d91544b130f13bf846ff080dda2867e77fe08700b793ab14ba5346f6', + 'sha256_manpages': '22b2380842ef75e9006c0358de250ead449e1376d7e5138070b9a3073ef61d44' + }, { 'version': '2.21.0', 'sha256': '85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee', @@ -175,7 +180,7 @@ class Git(AutotoolsPackage): depends_on('libiconv') depends_on('openssl') depends_on('pcre', when='@:2.13') - depends_on('pcre+jit', when='@2.14:') + depends_on('pcre2', when='@2.14:') depends_on('perl') depends_on('zlib') @@ -216,12 +221,17 @@ class Git(AutotoolsPackage): '--with-curl={0}'.format(spec['curl'].prefix), '--with-expat={0}'.format(spec['expat'].prefix), '--with-iconv={0}'.format(spec['libiconv'].prefix), - '--with-libpcre={0}'.format(spec['pcre'].prefix), '--with-openssl={0}'.format(spec['openssl'].prefix), '--with-perl={0}'.format(spec['perl'].command.path), '--with-zlib={0}'.format(spec['zlib'].prefix), ] + if '^pcre' in self.spec: + configure_args.append('--with-libpcre={0}'.format( + spec['pcre'].prefix)) + if '^pcre2' in self.spec: + configure_args.append('--with-libpcre2={0}'.format( + spec['pcre2'].prefix)) if '+tcltk' in self.spec: configure_args.append('--with-tcltk={0}'.format( self.spec['tk'].prefix.bin.wish)) -- cgit v1.2.3-70-g09d2