From abb6a0e0d18f39cabd84b118d52659e996137d6f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 30 Oct 2019 17:17:20 +0100 Subject: gnu: git: Add PCRE support to "git grep". * gnu/packages/version-control.scm (git)[inputs]: Add pcre2. [arguments]: Add "USE_LIBPCRE2" to make-flags. (git-minimal)[arguments]: Do not inherit "USE_LIBPCRE2" in make-flags. --- gnu/packages/version-control.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 573fa6f8cc..cc4e4ca20e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -183,14 +183,17 @@ as well as the classic centralized workflow.") ;; a problem in 'patch-shebangs'; see . ("bash-for-tests" ,bash) - ;; For 'gitweb.cgi' + ;; For PCRE support in git grep (USE_LIBPCRE2). + ("pcre" ,pcre2) + + ;; For 'gitweb.cgi'. ("perl-cgi" ,perl-cgi) ;; For 'git-svn'. ("subversion" ,subversion) ("perl-term-readkey" ,perl-term-readkey) - ;; For 'git-send-email' + ;; For 'git-send-email'. ("perl-authen-sasl" ,perl-authen-sasl) ("perl-net-smtp-ssl" ,perl-net-smtp-ssl) ("perl-io-socket-ssl" ,perl-io-socket-ssl) @@ -216,6 +219,8 @@ as well as the classic centralized workflow.") (assoc-ref %build-inputs "bash-for-tests") "/bin/bash") + "USE_LIBPCRE2=yes" + ;; By default 'make install' creates hard links for ;; things in 'libexec/git-core', which leads to huge ;; nars; see . @@ -505,6 +510,8 @@ everything from small to very large projects with speed and efficiency.") (delete-file-recursively (string-append out "/share/gitweb")) #t))))) + ((#:make-flags flags) + `(delete "USE_LIBPCRE2=yes" ,flags)) ((#:configure-flags flags) ''()) ((#:disallowed-references lst '()) -- cgit v1.2.3