From patchwork Sun Nov 26 03:12:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: spacecadet X-Patchwork-Id: 56822 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6E77C27BBEA; Sun, 26 Nov 2023 03:13:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3C32027BBE9 for ; Sun, 26 Nov 2023 03:13:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r75Zs-0007jF-L7; Sat, 25 Nov 2023 22:13:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r75Zp-0007im-NL for guix-patches@gnu.org; Sat, 25 Nov 2023 22:12:57 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r75Zp-0002we-FU for guix-patches@gnu.org; Sat, 25 Nov 2023 22:12:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r75Zu-00081y-H9 for guix-patches@gnu.org; Sat, 25 Nov 2023 22:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67450] [PATCH] gnu: grep: Fix pcre matching in grep. Resent-From: spacecadet Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 Nov 2023 03:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67450 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67450@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.170096834930806 (code B ref -1); Sun, 26 Nov 2023 03:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Nov 2023 03:12:29 +0000 Received: from localhost ([127.0.0.1]:40555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r75ZM-00080o-VU for submit@debbugs.gnu.org; Sat, 25 Nov 2023 22:12:29 -0500 Received: from lists.gnu.org ([2001:470:142::17]:44340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r75ZL-00080Z-93 for submit@debbugs.gnu.org; Sat, 25 Nov 2023 22:12:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r75ZA-00072w-IB for guix-patches@gnu.org; Sat, 25 Nov 2023 22:12:16 -0500 Received: from relay9-d.mail.gandi.net ([217.70.183.199]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r75Z9-0002sS-1U for guix-patches@gnu.org; Sat, 25 Nov 2023 22:12:16 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id 0F6FAFF803 for ; Sun, 26 Nov 2023 03:12:10 +0000 (UTC) Message-ID: Date: Sun, 26 Nov 2023 03:12:08 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Content-Language: en-US From: spacecadet X-GND-Sasl: spacecadet@purge.sh Received-SPF: pass client-ip=217.70.183.199; envelope-from=spacecadet@purge.sh; helo=relay9-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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(-) base-commit: 13bc0633e77c73389e530a4c45e2de5a823f106b 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