From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:54861) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPqhd-0003uK-QV for guix-patches@gnu.org; Wed, 30 Oct 2019 12:20:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iPqhc-0000X6-Du for guix-patches@gnu.org; Wed, 30 Oct 2019 12:20:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42527) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iPqhc-0000Wu-Av for guix-patches@gnu.org; Wed, 30 Oct 2019 12:20:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iPqha-0002vo-Ue for guix-patches@gnu.org; Wed, 30 Oct 2019 12:20:07 -0400 Subject: [bug#37994] [PATCH] gnu: git: Add PCRE support to "git grep". Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:54695) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iPqgz-0003NS-E7 for guix-patches@gnu.org; Wed, 30 Oct 2019 12:19:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iPqgx-0008QI-Px for guix-patches@gnu.org; Wed, 30 Oct 2019 12:19:28 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:41945) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iPqgx-0008On-Jx for guix-patches@gnu.org; Wed, 30 Oct 2019 12:19:27 -0400 Received: from localhost.localdomain (lfbn-1-4156-76.w92-169.abo.wanadoo.fr [92.169.151.76]) (Authenticated sender: mail@ambrevar.xyz) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 15E8160004 for ; Wed, 30 Oct 2019 16:19:23 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 30 Oct 2019 17:19:13 +0100 Message-Id: <20191030161913.17691-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 37994@debbugs.gnu.org * 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 . ("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 . @@ -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