GNU bug report logs - #37994
[PATCH] gnu: git: Add PCRE support to "git grep".

Previous Next

Full log

View this message in rfc822 format

From: Pierre Neidhardt <mail <at> ambrevar.xyz>
To: 37994 <at> debbugs.gnu.org
Subject: [bug#37994] [PATCH] gnu: git: Add PCRE support to "git grep".
Date: Wed, 30 Oct 2019 17:19:13 +0100

* 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 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 573fa6f8cc..1dad351ba1 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -183,6 +183,9 @@ as well as the classic centralized workflow.")
       ;; a problem in 'patch-shebangs'; see <https://bugs.gnu.org/31952>.
       ("bash-for-tests" ,bash)
 
+      ;; For PCRE support in git grep (USE_LIBPCRE2)
+      ("pcre" ,pcre2)
+
       ;; For 'gitweb.cgi'
       ("perl-cgi" ,perl-cgi)
 
@@ -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 <https://bugs.gnu.org/21949>.
@@ -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 '())
-- 
2.23.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.