mbakke pushed a commit to branch core-updates
in repository guix.

commit 14cd7675a36b137f38607591aca72d0877d834b5
Author: Marius Bakke <[email protected]>
AuthorDate: Thu Jun 30 16:03:56 2022 +0200

    gnu: pcre2: Use G-expression.
    
    * gnu/packages/pcre.scm (pcre2)[arguments]: Convert to gexp.
---
 gnu/packages/pcre.scm | 57 ++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm
index 8329b8d07d..f4f6152869 100644
--- a/gnu/packages/pcre.scm
+++ b/gnu/packages/pcre.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver <[email protected]>
 ;;; Copyright © 2015 Ricardo Wurmus <[email protected]>
 ;;; Copyright © 2016 Leo Famulari <[email protected]>
-;;; Copyright © 2017 Marius Bakke <[email protected]>
+;;; Copyright © 2017, 2022 Marius Bakke <[email protected]>
 ;;; Copyright © 2017 Ludovic Courtès <[email protected]>
 ;;; Copyright © 2017, 2021, 2022 Efraim Flashner <[email protected]>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <[email protected]>
@@ -33,6 +33,7 @@
   #:use-module (guix utils)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu))
 
@@ -100,33 +101,33 @@ POSIX regular expression API.")
               (sha256
                (base32
                 "0s4x2l6g0sb9piwkr3sxqwdswz2g6bk1hhwngv0kv4w38wybir0l"))))
-   (build-system gnu-build-system)
-   (inputs (list bzip2 readline zlib))
-   (arguments
-    `(#:configure-flags '("--enable-unicode"
-                          "--enable-pcre2grep-libz"
-                          "--enable-pcre2grep-libbz2"
-                          "--enable-pcre2test-libreadline"
-                          "--enable-pcre2-16"
-                          "--enable-pcre2-32"
-                          ;; pcre2_jit_test fails on powerpc32.
-                          ;; riscv64-linux is an unsupported architecture.
-                          ,@(if (or (target-ppc32?)
-                                    (target-riscv64?))
-                              '()
-                              `("--enable-jit"))
-                          "--disable-static")
-      #:phases
-      (modify-phases %standard-phases
-        (add-after 'unpack 'patch-paths
-          (lambda _
-            (substitute* "RunGrepTest"
-              (("/bin/echo") (which "echo"))))))))
-   (synopsis "Perl Compatible Regular Expressions")
-   (description
-    "The PCRE library is a set of functions that implement regular expression
+    (build-system gnu-build-system)
+    (inputs (list bzip2 readline zlib))
+    (arguments
+     (list #:configure-flags
+           #~'("--enable-unicode"
+               "--enable-pcre2grep-libz"
+               "--enable-pcre2grep-libbz2"
+               "--enable-pcre2test-libreadline"
+               "--enable-pcre2-16"
+               "--enable-pcre2-32"
+               ;; pcre2_jit_test fails on powerpc32.
+               ;; riscv64-linux is an unsupported architecture.
+               #$@(if (or (target-ppc32?) (target-riscv64?))
+                      #~()
+                      #~("--enable-jit"))
+               "--disable-static")
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'patch-paths
+                 (lambda _
+                   (substitute* "RunGrepTest"
+                     (("/bin/echo") (which "echo"))))))))
+    (synopsis "Perl Compatible Regular Expressions")
+    (description
+     "The PCRE library is a set of functions that implement regular expression
 pattern matching using the same syntax and semantics as Perl 5.  PCRE has its
 own native API, as well as a set of wrapper functions that correspond to the
 POSIX regular expression API.")
-   (license license:bsd-3)
-   (home-page "https://www.pcre.org/";)))
+    (license license:bsd-3)
+    (home-page "https://www.pcre.org/";)))

Reply via email to