all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#67450] [PATCH] gnu: grep: Fix pcre matching in grep.
@ 2023-11-26  3:12 spacecadet
  2023-11-26 13:59 ` bug#67450: " Tobias Geerinckx-Rice via Guix-patches via
  0 siblings, 1 reply; 2+ messages in thread
From: spacecadet @ 2023-11-26  3:12 UTC (permalink / raw)
  To: 67450

Fix grep not building with -P (perl regexp) support.

* gnu/packages/base.scm: Replace grep's pcre input with pcre2.
* gnu/packages/base.scm: Add "--enable-perl-regexp" configure flag to grep.
---
  gnu/packages/base.scm | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 41aff0ca97..feb5ca5746 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -120,9 +120,11 @@ (define-public grep
              (patches (search-patches "grep-timing-sensitive-test.patch"))))
     (build-system gnu-build-system)
     (native-inputs (list perl))                   ;some of the tests require it
-   (inputs (list pcre))
+   (inputs (list pcre2))
     (arguments
-    `(#:phases
+    `(#:configure-flags
+      (list "--enable-perl-regexp")
+      #:phases
        (modify-phases %standard-phases
          (add-after 'install 'fix-egrep-and-fgrep
            ;; Patch 'egrep' and 'fgrep' to execute 'grep' via its

base-commit: 13bc0633e77c73389e530a4c45e2de5a823f106b
-- 
2.41.0




^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#67450: [PATCH] gnu: grep: Fix pcre matching in grep.
  2023-11-26  3:12 [bug#67450] [PATCH] gnu: grep: Fix pcre matching in grep spacecadet
@ 2023-11-26 13:59 ` Tobias Geerinckx-Rice via Guix-patches via
  0 siblings, 0 replies; 2+ messages in thread
From: Tobias Geerinckx-Rice via Guix-patches via @ 2023-11-26 13:59 UTC (permalink / raw)
  To: spacecadet; +Cc: 67450-done

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]

Hi!

(Please don't hesitate to submit bug fixes upstream, especially 
when the breakage is so clearly unintentional :-)

I changed the changelog to better follow our standards

    gnu: grep: Fix PCRE matches (grep -P).

    {{{No blurb here if it only rephrases the title.}}}

    * gnu/packages/base.scm (grep)[inputs]: Replace pcre with 
    pcre2.
    [arguments]: Add "--enable-perl-regexp" to #:configure-flags 
    to
    detect broken PCRE in future.

and pushed this to core-updates as 
5b0cea02358044f0cc695bacc3f44db1e220239b.

Thanks,

T G-R

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-11-26 14:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-26  3:12 [bug#67450] [PATCH] gnu: grep: Fix pcre matching in grep spacecadet
2023-11-26 13:59 ` bug#67450: " Tobias Geerinckx-Rice via Guix-patches via

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.