all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Pierre Neidhardt <mail@ambrevar.xyz>
To: 37994@debbugs.gnu.org
Subject: [bug#37994] [PATCH] gnu: git: Add PCRE support to "git grep".
Date: Wed, 30 Oct 2019 17:19:13 +0100	[thread overview]
Message-ID: <20191030161913.17691-1-mail@ambrevar.xyz> (raw)

* 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

             reply	other threads:[~2019-10-30 16:20 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-30 16:19 Pierre Neidhardt [this message]
2019-10-30 17:15 ` [bug#37994] [PATCH] gnu: git: Add PCRE support to "git grep" Tobias Geerinckx-Rice via Guix-patches via
2019-10-30 19:53   ` Pierre Neidhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191030161913.17691-1-mail@ambrevar.xyz \
    --to=mail@ambrevar.xyz \
    --cc=37994@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.