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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 37994 in the body.
You can then email your comments to 37994 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Pierre Neidhardt <mail <at> ambrevar.xyz>
To: guix-patches <at> gnu.org
Subject: [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

Message #8 received at 37994 <at> debbugs.gnu.org (full text, mbox):

From: Tobias Geerinckx-Rice <me <at> tobias.gr>
To: Pierre Neidhardt <mail <at> ambrevar.xyz>
Cc: 37994 <at> debbugs.gnu.org
Subject: Re: [bug#37994] [PATCH] gnu: git: Add PCRE support to "git grep".
Date: Wed, 30 Oct 2019 18:15:47 +0100

[Message part 1 (text/plain, inline)]

Pierre,

Pierre Neidhardt 写道：
> * 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.

What do you think of removing pcre2 from INPUTS as well?

I'm a bit worried that upstream will grow auto-detection and/or 
change the default value of USE_LIBPCRE2 one day, and that would 
go unnoticed.

> +      ;; For PCRE support in git grep (USE_LIBPCRE2)

Missing ‘.’.

Otherwise GTM!

T G-R

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 37994 <at> debbugs.gnu.org (full text, mbox):

From: Pierre Neidhardt <mail <at> ambrevar.xyz>
To: Tobias Geerinckx-Rice <me <at> tobias.gr>
Cc: 37994 <at> debbugs.gnu.org
Subject: Re: [bug#37994] [PATCH] gnu: git: Add PCRE support to "git grep".
Date: Wed, 30 Oct 2019 20:53:23 +0100

[Message part 1 (text/plain, inline)]

Tobias Geerinckx-Rice <me <at> tobias.gr> writes:

> Pierre,
>
> Pierre Neidhardt 写道：
>> * 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.
>
> What do you think of removing pcre2 from INPUTS as well?

git-minimal's input is defined explicitly, no need to remove pcre2 since
it's not there.

> I'm a bit worried that upstream will grow auto-detection and/or 
> change the default value of USE_LIBPCRE2 one day, and that would 
> go unnoticed.

Found this: https://stackoverflow.com/a/49826828
Looks like the compile flags are here to stay :)

>> +      ;; For PCRE support in git grep (USE_LIBPCRE2)
>
> Missing ‘.’.

You mean the trailing period?  Actually I just noticed that about half
of those comments in Git have trailing periods.  I can fix it.

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[signature.asc (application/pgp-signature, inline)]

Previous Next

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